main page css complete
Merge branch 'master' into khoa2branch

Conflicts:
	app/assets/.DS_Store
	app/views/Trips/new.html.erb
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
Merge branch 'khoa2branch'