2 hours later, right back where i was 4 hours ago. yay
Merge branch 'develop-fei' into develop
Merge pull request #19 from binaricorn/develop

Merging in Fei's edits to homepage/css
Updated db content
Made some changes on the single project page
Merge branch 'develop-single-fei' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Responsive styling for single pages, tidied up footer and other small changes
Fixed a couple more things on the single project page
Merge branch 'develop-single-fei' into develop
Changed some h tags to Exo 2
Merge branch 'develop-single-fei-2' into develop
Merge pull request #21 from binaricorn/develop

Styling + responsive styling
Added video support to project detail
Merge branch 'develop-detail-videos' into develop
Added support for faculty thumbnail and show it in faculty detail
Merge branch 'develop-faculty' into develop