Merge branch 'm4ttclendenen-master'
Merge branch 'm4ttclendenen-master'

bc on point
Merge branch 'm4ttclendenen-master'
front page
Merge branch 'm4ttclendenen-master'

Conflicts:
	app/assets/stylesheets/welcome.css.scss
	app/views/welcome/index.html.erb
front design
Merge pull request #22 from tmatthews0020/master

merge