add resetWeapon and resetEffect function
Merge branch 'master' of github.com:miccrun/Flyving

Conflicts:
	Assets/Scripts/Player.cs
Another Merge