I have no idea what i have changed but it has to do with the pictures
Merge branch 'master' of https://github.com/richardritola/d441e4d9e8db0e8d48db176b20f2e8dc
Merge branch 'master' of https://github.com/richardritola/d441e4d9e8db0e8d48db176b20f2e8dc
started on the tilemap
Dafuq
Merge branch 'master' of https://github.com/richardritola/d441e4d9e8db0e8d48db176b20f2e8dc

Conflicts:
	loginmenu.cs
	obj/x86/Debug/GenerateResource.read.1.tlog
	obj/x86/Debug/GenerateResource.write.1.tlog
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Create_Game.cs
	obj/x86/Debug/GenerateResource.read.1.tlog
	obj/x86/Debug/GenerateResource.write.1.tlog