adding stuff to model layer
Merge branch 'master' of https://github.com/fbarquero/tournament_manager_api

Conflicts:
	controllers/tournament_manager_api.py
	models/db.py
Merge branch 'master' of https://github.com/fbarquero/tournament_manager_api

Conflicts:
	models/db.py