clean up
Merge branch 'master' of github.com:thismachinechills/webspade

clean up, i can't git right. take me out back and shoot me.