comment
grunt install
grunt-run
grunt set up
style updates
Sass conversion of styles
Content and style updates
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
	stylesheets/styles.css