Fixed h1 alignment issue on people pages.
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'production' of https://github.com/nirds/nird.us-sinatra into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
update people
Merge branch 'master' into production
Merge branch 'master' into production
updating marakana to newcircle
Merge branch 'master' into production
fixed broken twitter links.
updated contact buttons on the teach page to forward to the contact page.
Resolving merge conflicts