Signed-off-by: FusinThang <fusinthang@gmail.com>
Merge branch 'master' of https://github.com/FusinThang/dat_com

Conflicts:
	log/development.log
Update admin page
add some gems
update rspec
nothing new here
add rdoc
Merge branch 'master' of https://github.com/FusinThang/dat_com into code_v1

Conflicts:
	app/.DS_Store
	app/controllers/application_controller.rb
	log/development.log
	log/test.log
	spec/.DS_Store
	spec/spec_helper.rb
	spec/views/foods/new.html.erb_spec.rb
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/d6c7ce3ac277094b04690a43947ede22
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/edbf63d87f211c17de329b8a471a7caf
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655