added user model and started to work on copy from class example student model
modified user model
setting up user controller, added view pages and enabled services code
Merge branch 'master' of github.com:akalelkar/CSC694-Assessment
removed old files
added admin module into repo
modified global.php
converting user module to use abstract database class
config db to user controller
tweaking user controller and models to actually work
add bootstrap to user index.phtml
Merge pull request #15 from JohnCannonIT/master

Added documents folder; added ER diagram
style forms and add select list to form
adding methods to get user roles and add to user object, adding checkboxes for multiple roles
Merge branch 'master' of github.com:akalelkar/CSC694-Assessment
Merge pull request #16 from jgregorynoctrl/master

Several Changes to the Admin/User model
Testing git connectivity
Merge pull request #3 from akalelkar/master

Update my repo
testing git, no changes
First Raw MySQL text file added 2/11 to documents