updated readme

README.md

@@ -1,19 +1,22 @@
 Nepali Calendar
 ================
 
-Note: The project is not completed yet. This application is not in a state of being used. Stay in touch for further progress.
+Version 1.0 is complete! 
 
 <h2>Introduction</h2>
 
-A Nepali Calendar built using angular.js and foundation.css. The calendar can be generated of any month from 2000 BC to 2090 BC.
+A Nepali Calendar built using angular.js, foundation.css and jquery mobile. The calendar can be generated of any month from 2000 BC to 2090 BC.
 
 The features of this application are:
 - Calendar.
 - Date Conversion from AD to BC and vice-versa.
-- Calendar automatically generated of a specific month.
-- Shows events of 2070 BC (2nd phase)
-- User can put their own event (2nd phase)
+- Calendar automatically generated of a specific date, month, year.
 
 Technical Specs:
 - angular.js
-- foundation.css
+- foundation.css
+- jquery mobile
+
+The features for V2.0: 
+- Shows events of 2070 BC (Backend done - check issue https://github.com/prashishh/NepaliCalendar/issues/3)
+- User can put their own event

install.html

@@ -5,7 +5,11 @@
 
 <title>Install नेपाली पात्रो!</title>
 <script>
+<<<<<<< HEAD
 var manifest_url = "/Volumes/works/Gitub/NepaliCalender/manifest.webapp";
+=======
+var manifest_url = "http://prashishh.github.io/NepaliCalendar/manifest.webapp";
+>>>>>>> gh-pages
 var request = navigator.mozApps.install(manifest_url);
 	request.onsuccess = function() {
 	alert('Done');