I really hope this works
Merge pull request #4 from ajl2612/master

Updates from friday that did not commit for some reason