Merge!
Merge branch 'master' of github.com:flyingoctopus/youngagrarians into parent-master

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb