shit
Merge branch 'master' of https://github.com/chrissilich/CircusGameDev2014Q3TeamSamus

Conflicts:
	game/Assets/Prefabs/Ricky.prefab
	game/Assets/Scenes/Amanda.unity
	game/Assets/Scenes/Level1jell.unity
	game/Assets/Scripts/Unknown Origin/RickyMovements.js