fix gemfile
Merge branch 'master' of github.com:araya810/theones

Conflicts:
	Gemfile