fixed a merge conflict, not sure why it occurred
ldap changes
Disable working
Disable working
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge pull request #40 from SteveLobdell/master

Changes
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge pull request #41 from tmfroem/master

Outcomes update 3-5
deletions
Merge branch 'feature'
st clair deletions
session variables
Merge branch 'master' of github.com:akalelkar/CSC694-Assessment
Merge branch 'master' of github.com:jgregorynoctrl/CSC694-Assessment
applying lost changes back to admin module
removed line to user generic queries in application
made modifications to user sub module to work with database changes and program submodule progresss
testing container in other modules
conflicts fixed
add/update/delete functions for users and programs