Game was lookin good, then I fucked it up :D

Fixed it tho!
Merge remote-tracking branch 'origin/Josh'

Conflicts:
	Hamster/Assets/Levels/level 2.unity
	Hamster/Hamster.userprefs
	Hamster/Library/CurrentLayout.dwlt
	Hamster/Library/CurrentMaximizeLayout.dwlt
	Hamster/Library/assetDatabase3
	Hamster/Library/expandedItems