Stuff
Merge branch 'master' of https://github.com/jploeger/frontend2

Conflicts:
	index.html