no message
Merge branch 'homeDesign' of https://github.com/gallardo1226/veracity into homeDesign

Conflicts:
	veracity/public/stylesheets/style.css