finished a bunch of shit
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev

Conflicts:
	GameJam2013/Assets/Scripts/Camera/GameManager.cs
more finishing touches