README.md in rb-dayone-0.1.3 vs README.md in rb-dayone-0.1.5

@@ -1,16 +1,27 @@
-rb-dayone
-<<<<<<< HEAD
-===========
+# rb-dayone
 
 A means to create DayOne entries in ruby.
 
 Examples
 --------
 
+You can create an entry pretty simply, by passing in your entry text:
+
   e = DayOne::Entry.new "# Hello, world!"
+  
+You can also set up other values via a hash:
+
+  e = DayOne::Entry.new "I totally posted this an hour ago", creation_date: Time.now-3600
+
+Otherwise, you can set values using simple accessor methods, as you'd expect:
+
+  e = DayOne::Entry.new "I need to remember this."
   e.starred = true
+
+When you're ready to save your entry, just run the `create!` method:
+
   e.create!
 
 Install
 -------
 
@@ -24,10 +35,11 @@
 Roadmap
 -------
 
 * Image support
 * Location support?
+* Auto-location detection
 
 License
 -------
 
 Copyright (c) 2012 Jan-Yves Ruzicka
@@ -48,10 +60,5 @@
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=======
-=========
-
-A ruby library for creating (and, one day, editing and removing) DayOne.app entries
->>>>>>> d4606a817c5f5757f6b5e4c996d7f61cb0d023b1