adding stuff
Merge pull request #5 from zachsergeant/jon-feature

adding stuff