Merge pull request #10 from emrickgarrett/master

asdfadsgasdgasdg
asdfasd
Merge pull request #37 from caitlinvangundy/master

egaqq