Merge branch 'master' of https://github.com/pboennig/Genie

Conflicts:
	.gitignore