gitignore
Merge branch 'master' of https://github.com/gmuecke/awtt

Conflicts:
	.gitignore