changed stuff
Merge branch 'master' of https://github.com/merrickfox/ThePerfectGame

Conflicts:
	Assets/Scripts/JP_Interaction.cs
	Assets/Scripts/MF_TrapScript.cs
lots of stuff