updated gems
Merge branch 'configure'

Conflicts:
	Gemfile
	Gemfile.lock