Added basic second screen with a test
Added basic table functionality but still no tests
Added test for second screen
Removed some files
modified a file
Merged second screen with master