for merging
Merge branch 'master' of https://github.com/luismfonseca/haxor-progfun

Conflicts:
	Assets/Scenes/mainScene.unity
	Library/metadata/e3/e3a04618455f1f245b53a659e619d654