Edited the About us mission statement
Comflicts resolved
Merge branch 'master' into alex

Conflicts:
	app/views/gallery.blade.php
	public/assets/css/ca_style.css
Merge pull request #47 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony

Conflicts:
	app/views/gallery.blade.php
testing image