cameron's first pull request
Merge pull request #2 from cameronjacoby/master

cameron's first pull request