Updated styling and icons
Merge branch 'gh-pages'

Conflicts:
	css/styles.css
	index.html