changed player sprite sheet and json file paths to come from level.py and edited json file so that both sprite sheets would display the correct animations
Merge branch 'master' of github.com:Jesse-calkin/GGJ2014

Conflicts:
	classes/platformer/level.py