again
move db
merge
Merge branch 'master' of https://github.com/lascar/python-test-driven

Conflicts:
	database/db.sqlite3
	static