Connor is combining Gabe and Connor's things

GHOST PLAYER (his body is over there, colliding with a wall.
Merge branch 'master' of https://github.com/GabrielAppleby/heartofthecards

Conflicts:
	Assets/Resources/Scripts/Gabe'sScrapPaper.js