pics
Merge branch 'm4ttclendenen-master'

Conflicts:
	app/assets/stylesheets/welcome.css.scss
	app/views/welcome/index.html.erb
front design