Merged with upstream
Merge remote-tracking branch 'upstream/develop' into develop
Made category & tag archive pages work
Merge branch 'develop-cat-tag' into develop
reformatted the project pages so thesis faculty are in a 2-column div, replaced 'view project link' with icon
Merge branch 'develop-project-single' into develop
Merge pull request #46 from binaricorn/develop

Merging Fei's work on reformatting single project page
Merge pull request #47 from palaa159/develop

Merging Apon's animated hero work
Merge pull request #49 from palaa159/develop

Merging Apon's interactive hero -- atempt 2!
Added 3d portraits to student listing & detail page. Made pic bigger on detail page
Merge branch 'develop-student-pics' into develop
Merge pull request #51 from palaa159/develop

Merging Apon's changes: edit footer, search, faculty, homepage
FUCK YOU .DS_STORE
Front-end interaction for choosing categories in project listing
Merge branch 'develop-category' into develop
implement cat
Merge remote-tracking branch 'upstream/develop' into develop

merge to develop
fix cat