Main page in progress.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
Merge remote-tracking branch 'origin/master'