FITNESS
Merge branch 'master' of https://github.com/quatrosem/Bangkok__WEB

Conflicts:
	web/db.sqlite3
	web/polls/interface.pyc