Quincy and Kamilla on student/project page
Quincy and Kamilla on student/project page
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
quincy's test which includes image thumnails on project listing page
Merge branch 'develop-quincy-test' into develop
Merge pull request #5 from qkbock/develop

Develop
Added Masonry code for just the Projects page + altered some column widths in main
Merge branch 'develop-masonry' into develop
Merge pull request #6 from binaricorn/develop

I didn't test this first! Hope it's ok!!!
Added a  to README before submitting a pull request, and fixed a php bug in project listing
Updates to faculty, footer, search results, project detail, and project page

faculty
- added faculty to database
- print title & content on faculty page

footer
- list faculty from db
- added committees & members (hard-coded)

search results
- worked on cleaning up formatting for results
- only students & projects are displayed (no faculty)
- results are displayed consistently with title first and students underneath, regardless of whether the search matched a student or project
- added project thumbnail, category & tags for each project, inside an html comment

project detail
- only print faculty once if the same between fall & spring semesters
- otherwise print both with Fall/Spring label
- added category & tags, inside html comments

project list
- added category & tags for each project, inside html comments
Merge branch 'develop-dbhookup' into develop
Merge branch 'develop'