removed home.html
removed columns from about page, modified page headers
changed about page
bottom-info changes
merging
Merge branch 'cyrus' into home-page