Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Game.unity

-UPDATED- OSI to change w/ screen res (not done)