Fixed and cleaned up footer
Worked on footer more
Moving info from footer to about us section
Fixed footer. Took the color away

Made it part of the section above it. It flows better.
Merge branch 'master' into footer

Conflicts:
	assets/css/main.css
	index.html