201308231711

上傳照片功能
201308231825

圖片上傳
test
test
201308231831

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/devise/registrations/edit.html.erb
	db/schema.rb
test