Unity

Trying to make unity work
Merge branch 'master' of https://github.com/jonatanBenAmi/DungeonCrawlerGame

Conflicts:
	.gitignore