Save changes

Conflicts:
	assets/css/style.css
Merge branch 'master' into gh-pages