yy 1:22
Merge branch 'master' of https://github.com/whyvine/shichajob

Conflicts:
	app/views/shichajob/_tabsignin.html.erb