resolving conflict on index with pul request
Merge branch 'gh-pages' of github.com:p2pu/reports into gh-pages