Sqlite3
Merge branch 'master' of https://github.com/kayethano/empireBT

Conflicts:
	empirebt/settings.py