s

s
s

s
minor db alterations (globals)
merge resolution
minor db alterations (globals)
merge resolution
merge resolution
added a comma
new user
Merged in Justin R's code (Logging in, group membership)
updating databases
profile stuff
Adding malik's profile backups
db.py backup
cleaning up prior to master merge
merge jeff into master
minor header changes, fixed broken contact and about links
removed manage from nav for now, do we need it?
another tiny tweak
Updated profile for user permissions, added .gitignore