first commit
Merge remote-tracking branch 'heroku/master' into develop

Conflicts:
	app/assets/stylesheets/main_page.css.scss
	app/views/main_page/index.html.erb
111