Crosshair fix
Merge branch 'master' of https://github.com/acus512/stlgamejam_sept2013

Conflicts:
	Assets/Prefabs/Player.prefab
sgadfhsah
Merge branch 'master' of https://github.com/acus512/stlgamejam_sept2013