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

Conflicts:
	GameJam2013/Assets/test.txt.meta
downgrade to 3.5.6
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev