ignoring ds.store file
added text to title
Fixed conflict, edited title