yy 8:28
Merge branch 'master' of https://github.com/whyvine/shichajob
yy 9:02
Merge branch 'master' of https://github.com/whyvine/shichajob

Conflicts:
	app/controllers/shichajob_controller.rb
Merge branch 'master' of https://github.com/whyvine/shichajob
yy 10:00
Merge branch 'master' of https://github.com/whyvine/shichajob