enter werkt
Merge remote-tracking branch 'origin/master'

Conflicts:
	newstopia/db.sqlite3
final
Merge remote-tracking branch 'origin/master'

Conflicts:
	newstopia/db.sqlite3
final