trouble with .DS_Store...
more .DS_Store probs...
Merge branch 'master' of https://github.com/vijakshay/Travel-Diary

Conflicts:
	Data/.DS_Store