Merge pull request #2 from emrickgarrett/master

hi there
Merge pull request #40 from hill1303/master

Merge pull request #2 from emrickgarrett/master
Update issue resolved
Message
Merge pull request #41 from caitlinvangundy/master

Merge pull request #11 from emrickgarrett/master
Merge pull request #12 from emrickgarrett/master

asdf