update
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev

Conflicts:
	GameJam2013/Assets/Scenes/PlayMechanicsTest.unity