Backup push before fixing the game
Backup push before fixing the game
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Player.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Merge pull request #20 from floorman/master

Backup push before fixing the game