Initial chat code added to /chat
Added group and permission prototypes
Merge remote branch 'origin/api' into permissions
Merge in user profiles
Added a new view for permissions, only lists permissions present.
Merge branch 'feature-ui' of https://github.com/darrenburns/TeamProject3 into feature-chat
Merge api into chat
Merge branch ui-ajax into feature-chat
Not working, but saving work. Still to build groups, permissions, and finish views code.
Fixed lockfile upload
Merging with master to stay current, no changes.
Working groups and basic permissions now functional, can be populated via populateGroups.py
Working permissions page now available! Only adding group functionality at this time, but it's a proof of concept.
Slight edit to README, command missing from database instructions.
Added removal functionality for groups, made a slightly better interface.
Cleaned up debugging code.
Cleaned up.
Merge pull request #7 from darrenburns/permissions

Permissions merged into Beta.
Changed list comprehension on Darren's request for readability.
Merge branch 'beta' of github.com:darrenburns/TeamProject3 into beta