some feature that i added
added stuff
changed stuff
Merge pull request #1 from bryancannon/some-feature-branch

adding some feature into the master