created badges and skills model
Merge branch 'master' of github.com:davit-khaburdzania/code-world

Conflicts:
	db/schema.rb