ading db files
Merge branch 'master' of https://github.com/ernest21/bilden

Conflicts:
	db/development.sqlite3