Initial commit
Merge remote branch 'GodOfMoods/master'

Conflicts:
	.gitignore