Merge branch 'master' of github.com:akalelkar/CSC694-Assessment into admin
added pagniation code to user controller
added queries class and working on pagination for users
added program files and tweaks to user controller
added page to user route
Merge branch 'admin'