[+] Updated Unity settings.
Merge branch 'master' of https://github.com/apulcini/TheMightyPuck

Conflicts:
	TheMightyPuckUnity/TheMightyPuckUnity.userprefs