Team-H/gateway — pull request #69 by ChristianMurphy (2014-02-17 18:04:36+00:00)
Title: more changes to teacher profile page (pagination, bio/edu/work, formatting)

fixing merge conflicts