new1
Merge branch 'master' of https://github.com/whyvine/shichajob

Conflicts:
	app/controllers/shichajob_controller.rb
	config/routes.rb