Badge awarding
Merge pull request #396 from andrewhayward/aestimia

Badge awarding