Merge branch 'master' of https://github.com/Aventyret/Hammer---Chisel

Conflicts:
	build/style.css
	master.scss
	sass/_modules.scss
	sass/_plugins.scss
	sass/framework/_layout.scss
	sass/project/_base.scss
	sass/project/_project.scss
	sass/project/_settings.scss
FIXED CONFLICTS