initial commit
init commit
Merge branch 'master'

Conflicts:
	app/assets/stylesheets/static_pages.css.scss
	app/views/layouts/_header.html.erb
	app/views/static_pages/home.html.erb
commit of updates
custom styles