add application layout
Merge branch 'feature/include_basic_theme' into develop
complete main page
Merge branch 'develop' of github.com:railsgirls-china/railsgirls into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb