Added table sorting and filtering, minor fixes
Merge branch 'master' of https://github.com/mkSol/CTEC227-Project