some changes
fixed merge conflicts
Merge pull request #16 from kevincol54/master

just a few minor changes