init
Merge branch 'master' into gh-pages

Conflicts:
	Gemfile
	Gemfile.lock
	source/index.html.erb
	source/javascripts/all.js
	source/layouts/layout.erb