Merge pull request #1 from tbreiner/master

Theresa's first commit
update for Wednesday

changes to i/o mostly