database
Merge branch 'master' of github.com:Wartz/joeschlimmer

Conflicts:
	db/js_database.db