Problems

I suck
Merge branch 'master' of https://github.com/alw231/RedesigNU

Conflicts:
	deploy/css/desktop.css
	deploy/index.html
	deploy/js/main.js