Adding some overdue badges
Merge branch 'making-badges'