gen code
Merge branch 'master' of https://github.com/frankswu/jobs.ruby.tw

Conflicts:
	app/views/events/index.html.erb
	app/views/events/show.html.erb