modified:   src/shared/core/Ogre.js
	modified:   src/shared/core/Player.js
	modified:   src/shared/weaponinstances/Sword.js
	modified:   src/shared/weapons/Sword.js
Merge branch 'master' of https://github.com/scranley/Defend-the-Great-Potion

Conflicts:
	src/client/scripts/core/ClientGameEngine.js
	src/client/scripts/core/ClientOgre.js
	src/shared/weaponinstances/Sword.js

	modified:   src/shared/core/GameEngine.js
	modified:   src/shared/core/Ogre.js
	modified:   src/shared/weaponinstances/Sword.js