final
Merge branch 'master' of https://github.com/Weldeasy/godcode

Conflicts:
	media/css/style.css
	media/css/usersettings.css
errores