Travel Journal App
Merge branch 'master' of https://github.com/horiajurcut/gcdc.2007

Conflicts:
	.gitignore