fix google map
Merge remote-tracking branch 'upstream/develop' into develop

merge
Merge remote-tracking branch 'upstream/develop' into develop
commit
Merge remote-tracking branch 'upstream/develop' into develop

merge
add shader for hero
Merge pull request #47 from palaa159/develop

Merging Apon's animated hero work
fix shader div
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
edit footer, search, faculty, homepage
Merge branch 'dev-apon' into develop

merge
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