Not really sure everything here...
deleted som shtuff
Merge branch 'master' of https://github.com/heyjonuland/WebsiteDesign

Conflicts:
	Jon Uland Website/Stylesheet.css
	Jon Uland Website/Stylesheet.css.map
	Jon Uland Website/Stylesheet.scss
	Jon Uland Website/config.codekit
	Jon Uland Website/index.html