finishing
Merge pull request #31 from eric-townsend/lolz

finishing