La til download og upload funksjon.
Merge branch 'master' of https://github.com/kriaxen/slit

Conflicts:
	build/web/resources/css/blog.css
	build/web/resources/css/kristianCSS.css
	build/web/student/overview.xhtml
	build/web/teacher/approveModule.xhtml