fixed beardo
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter
updated sprites
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter
stuffthings
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter

Conflicts:
	EnchantJS Prototype/bullet.js
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter
Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter