restart
add requirements, index page on
Merge branch 'feature/restart' into develop
Merge branch 'master' into develop

Conflicts:
	app/__init__.py
	app/views.py
	manage.py
	requirements.txt
delete legacy files
Merge branch 'master' into develop

Conflicts:
	requirements.txt
Merge old develop branch and modify things
Merge branch 'master' into develop

Conflicts:
	settings.py
merge things, all done