no message
Merge branch 'master' into feature/peony

Conflicts:
	pages/index.html
	pages/style/css/main.css.map
	pages/style/css/main.min.css
	pages/style/sass/main.sass
fixed hover
updated logo and colours
Merge branch 'master' into feature/peony
Merge branch 'master' into feature/peony

Conflicts:
	pages/index.html
Merge branch 'feature/peony'