checkout conflict resolution
Merge branch 'master' of https://github.com/TCSS360Group5/MSEE.git
Merge branch 'master' of https://github.com/TCSS360Group5/MSEE.git
slight change to TableModel