+ therubyraces
Merge branch 'master' of github.com:Lightpower/vedmak

Conflicts:
	Gemfile