Removed Add and Edit buttons
Merge branch 'master' into Adam
Commented out files not needed
Made table View test
committing two files