new cool things
new cool things
Merge branch 'master' of https://github.com/Picsou/Duo-Portal

Conflicts:
	static/index.html
	static/js/static.js