New Rickys in Design Files, not in game yet.
Merge branch 'master' of https://github.com/chrissilich/CircusGameDev2014Q3TeamSamus

Conflicts:
	design/jenny/fence colored-01.png