Work on weapon
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14

Conflicts:
	Assets/Resources/OneWayPlatform.prefab
	Assets/Resources/Player1.prefab
	Assets/Scenes/Game_without_level.unity