added all files to the repo
added tom's other files
Merge remote-tracking branch 'origin/master'