Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
fixed color issue with button on landing page
bad image urls in custom section
bad image link on about page
killed a test post in news
Merge branch 'gh-pages'