first commit
Merge branch 'master' of https://github.com/mmonti/globers-mood

Conflicts:
	.gitignore