Added Gems
Added Gems
Merge branch 'master' of https://github.com/camcross/rafiki

Conflicts:
	Gemfile