syncing project
Merge branch 'master' of https://github.com/Sluip/OOSE-Project

Conflicts:
	Assets/Prefabs/BitchObject.prefab
	Assets/Scripts/EnemyScript.cs
	Assets/Scripts/PlayerScript.cs
	Assets/stage1.unity
.
melee system know works, doing only 1 damage pr. key press