Initial commit
NEw thing
Merge branch 'master' of https://github.com/oyvind-kjerland/2D-Game

Conflicts:
	.gitignore