Changes
Merge branch 'master' of https://github.com/mattisbodtker/ADD-site

Conflicts:
	css/style.css
	js/projects.js