updated rails
Merge branch 'master' of github.com:next-l/enju-diary

Conflicts:
	Gemfile.lock