test
Merge branch 'master' of https://github.com/fbarquero/tournament_manager_api

Conflicts:
	views/default/test.html