Merge pull request #5 from kylestlb/master

Was trying to update NicoleBranch, which did happen, but it caused the master branch to merge with mine, so trying to undo it.