Exec bundle update
Merge branch 'master' of github.com:kaznum/sanataro

Conflicts:
	Gemfile.lock