cleaned up files, started parseTable function
Merge remote-tracking branch 'origin/master'