version 2.1
Merge branch 'gh-pages' of https://github.com/antonmaximus/site6_colored into gh-pages

Conflicts:
	Gemfile
	Gemfile.lock
	build/index.html
	config.rb
	source/index.html.haml
	source/layouts/layout.html.haml