commit
commit
contact#index
Merge remote-tracking branch 'upstream/master'
Merge pull request #9 from shal23/master

added contact page
improve tutorials MV&C
merge shals code
add html_safe to tutorial show
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	app/assets/stylesheets/bootstrap_and_overrides.css.scss
	db/schema.rb