Hopefully conflicts are resolved this time
Fixed merge conflicts, up to date with branch (hopefully)
Updated rest of the projects
Quick fix to the "Status" classes
sorting in projects
added small tidbit to contact
Starting on the icons from the font
Temporary icons for projects
Whoops, too big
My last change to this for now I promise
moved pgp tp active
Merge branch 'columns' of git.gmu.edu:srct/srctweb into columns
changed an icon or two, and made them a smidge smaller
I can't decide what should be the tagline for this page
typos
hardcoded the next meeting time to index
added icons
changed a project icon
icons fixed width
added icons to index