MUCHOS cambios
Merge branch 'master' of https://github.com/gustav0/teambuilder

Conflicts:
	teambuilder.sqlite3