migrations and models
Merge conflict

Merge branch 'benedikt'

Conflicts:
	css/styles.css