?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
changed Learnmore link to About us page.  Minor layout spacing changes.
layout tweaks.