Site updated at 2014-04-07 16:20:29 UTC
Merge branch 'master' into gh-pages

Conflicts:
	Gemfile
	Gemfile.lock
	LICENSE
	README.md
	favicon.ico
	feed.xml
	index.html
Merge branch 'gh-pages'