some changes
fix merge conflict
fix merge conflict
Merge pull request #28 from cameronjacoby/master

some commits to fix my merge conflicts