Resolve merge conflicts.
Merge branch 'master' of github.com:callen6/ProtoBreadcrumbsAndBeanstalks
Add about page text.
Fix about and img on down.