init commit
Merge branch 'master' of https://github.com/vampireneo/PassionTimesApp

Conflicts:
	.gitignore
	README.md