Removed todo
Added fake-server comments
Added docs
Merge branch 'master' of github.com:balazsdano/badges

Pulled from master