Silly files.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Unity/Unity-csharp.sln
	Unity/Unity.sln
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Unity/Unity-csharp.sln
	Unity/Unity.sln
Added new map + some changes to old map. Edited levelloader.js to fix a
spelling issue I created in my map file.
Merge pull request #11 from Pyriana/master

Fixed Collision_Walking spelling, added map/zones for you to play with.