Merge branch 'master' of https://github.com/tuanequintella/spjam2014

Conflicts:
	Assets/MainScene.unity
Merge branch 'master' of https://github.com/tuanequintella/spjam2014

Conflicts:
	Assets/MainScene.unity
commit do Savoia