Merge pull request #12 from niode/nathan

Nathan
Stuff
Merge branch 'master' of https://github.com/niode/cpsc433
More merging
Pushing: might be almost done with bugs
Resend
Removed references to file_read, currentTime.