badges added
Merge branch 'register'