-Ajustes varios
Merge branch 'master' of https://github.com/aleycris/WellMets-CrossFit

Conflicts:
	www/finishtask.html