testing thot.cs.pitt
testing
Merge branch 'master' of ../THOTrepo
pushed to thot from thot
added note and finished testing
testing complete