Added player melee
Merge branch 'master' of https://github.com/crobinson33/OSHO

Conflicts:
	Enemy.cs