taking out broken shit
Merge pull request #43 from jtrope89/master

i desire to be merged