fixed update profile and signup bug
modify layouts
Merge pull request #19 from caok/master

modify layouts
#18 add rmagic gem
#18 update pic to avatar
#18 add avatar upload to personal manage
#18 replace rmagick to mini_magick
update avatar edit
add some gems for tests
modify home#index
Merge pull request #20 from caok/master

modify home#index
update photouploader
Merge branch 'master' of github.com:brtr/mvp
Merge pull request #21 from caok/master

update photouploader
#13 remove business, add order
modify the status of offer
#13 update order and fixed some tests enviroment
modify seeds
Merge branch 'master' of github.com:brtr/mvp

Conflicts:
	app/models/offer.rb
	db/seeds.rb
Merge pull request #22 from caok/master

modify the status of offer and seeds