redesign bootstrap start
for michael
add style layout
reload project folder
Merge branch 'dev' into 619_home_page

Conflicts:
	app/assets/stylesheets/application.scss
	app/views/layouts/application.html.haml
Merge pull request #11 from is-valid/619_home_page

619 home page