Display GitHub contributions too
Fix some weird conflicts.
Merge branch 'gh-pages' of https://github.com/scrapmac/leaderboard into gh-pages

Conflicts:
	js/dashboard.js

Conflicts:
	js/dashboard.js