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

Conflicts:
	Library/assetDatabase3
	Library/metadata/23/23c0e93c113e4eb47bfee0858b2ee017
	Library/metadata/a1/a13a8befff5a2634fa8398cc602ddaee
	userSavedGame.dat
merge
Merge branch 'master' of https://github.com/luismfonseca/haxor-progfun

Conflicts:
	Library/assetDatabase3
Merge branch 'master' of https://github.com/luismfonseca/haxor-progfun
Clearance and documentation of the code, calibrating the viewport, bug fixes, etc...