clean out server a bit
Merge branch 'master' of github.com:agentwaj/yc-hacks