adding stuff
Merge pull request #28 from eric-townsend/lolz

adding stuff