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

Conflicts:
	app/controllers/indiv_center_controller.rb
	db/schema.rb