simple login
Merge branch 'master' of https://github.com/univie/univie.github.io

Conflicts:
	javascripts/main.js