- adde dgit ignore
Merge branch 'master' of https://github.com/Avnerus/ggj2

Conflicts:
	.gitignore