ignore
Merge branch 'master' of https://github.com/mmanske/Vamu

Conflicts:
	.gitignore