Updated path
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	css/styles.css
Merge branch 'master' of https://github.com/alexsb/mu-8