Updated Bullets, Weapons, And Maps

Updated lots of stuff...
Merge branch 'Tristan'

Conflicts:
	OtterTutorial.v12.suo
	OtterTutorial/Assets.cs
	OtterTutorial/Entities/Bullet.cs
	OtterTutorial/Util/Map.cs
	OtterTutorial/bin/Debug/OtterTutorial.exe
	OtterTutorial/bin/Debug/OtterTutorial.pdb
	OtterTutorial/obj/Debug/OtterTutorial.exe
	OtterTutorial/obj/Debug/OtterTutorial.pdb
Merge branch 'master' of https://github.com/NeimanSch/ProjkDolfin_1.1