a
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	css/css.css
	img/sprite.png
	index.html
	js/scripts.js