Merge remote-tracking branch 'honzajavorek/gh-pages' into patch-1

Conflicts:
	css/main.css