correciones
Merge branch 'master' of https://github.com/ddealers/skyrocket

Conflicts:
	nivel4/U1A2/js/main.coffee
	nivel4/U1A2/js/main.js
	nivel4/U1A2/js/min/main.min.js
	nivel4/U2A3/js/main.coffee
	nivel4/U2A3/js/main.js
	nivel4/U2A3/js/min/main.min.js
	nivel4/U3A2/js/main.coffee
	nivel4/U3A2/js/main.js
	nivel4/U3A2/js/min/main.min.js
	nivel4/U3A4/js/main.coffee
	nivel4/U3A4/js/main.js
	nivel4/U3A4/js/min/main.min.js
	nivel4/U4A4/js/main.coffee
	nivel4/U4A4/js/main.js
	nivel4/U4A4/js/min/main.min.js
	nivel4/U5A2/js/main.coffee
	nivel4/U5A2/js/main.js
	nivel4/U5A2/js/min/main.min.js
	nivel4/U5A3/js/main.coffee
	nivel4/U5A3/js/main.js
	nivel4/U5A3/js/min/main.min.js
	nivel4/U6A4/js/min/main.min.js
	nivel4/U8A1/js/main.coffee
	nivel4/U8A1/js/min/main.min.js
	nivel4/U8A3/js/main.coffee
	nivel4/U8A3/js/min/main.min.js