Merge pull request #10 from Cdingram/master

Timing, files, etc
testing dictionaries
testing
test
deadlock
test
test
test
test
test
test
test
test
cody sucks
message
message
chris
 chris
 chris
Merge pull request #11 from aktse/master

half done