Add shade hitboxes to platforms
Merge branch 'master' of github.com:esjay/purplemonkeygamejam-june-2014

Conflicts:
	js/player.js