change the bean
Merge branch 'master' of https://github.com/frankswu/myRubyTemplate

Conflicts:
	code/bean.yml