started adding things to player.js component for easy player additions.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/scenes/test.js
started adding things to player.js component for easy player additions.
started adding things to player.js component for easy player additions.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/components/Punch.js
new player component