Merge branch 'develop' into jasons
Add some height to keep text from touching
25 more px for about link to not ride to top
Merge branch 'jasons' into develop