cleaning up some code
Merge branch 'master' of https://github.com/benjaminpstern/GameplayPrototype
Player now does not trigger mines
Made enemies work with peter's updated line of sight code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/Scripts/InvisResource.cs
	Assets/Scripts/PlayerMovement.cs
Made push mines. Code is ugly, fix after prototype
fixed a thing. The collider for the player must not have the kinematic box
checked
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/_Scenes/Scene2.unity