stuff
Merge branch 'master' of https://github.com/AngelhackDogteam/web-app

Conflicts:
	dogteam/templates/index.html