badges spec
Merge branch 'merits' into working
merge
badges spec