yy 8:44
Merge branch 'master' of https://github.com/whyvine/shichajob

Conflicts:
	db/schema.rb
yy 8:55