results
Merge branch 'master' of https://github.com/mfmagnus/KjorCaseStudy

Conflicts:
	style/stylesheets/global.css
first release
first release