recommiting files
Merge pull request #10 from cwallwork/master

recommiting files