Merge branch 'master' of https://github.com/andy4thehuynh/shePalette

Conflicts:
	css/style.css
	index.html
	scss/style.scss