I don't know what I'm doing
Merge branch 'master' of https://github.com/valeriobasile/storkl

Conflicts:
	app/models.py
	app/views.py
	db_create_test_data.py