Start
Merge branch 'master' of github.com:rthees/stadtklick

Conflicts:
	.gitignore