done for the night
Merge pull request #10 from bchiatt/dev

done for the night