commit: Gemfile.lock
Merge branch 'master' of github.com:esehara/zanmemo

Conflicts:
	Gemfile.lock