route change with selected places
working on save places
Merge branch 'master' into Jordan

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655

merge with Jordan
Merge branch 'Jordan'

add Jordan testing
Merge pull request #7 from tranlannhi/Jordan

api controllers
main page css complete
Merge pull request #9 from tranlannhi/Jordan

prepped for testing
working savePlaces
Merge branch 'master' of https://github.com/tranlannhi/DayTrip

Conflicts:
	db/schema.rb
	log/development.log
resolve conflict
fix indentaion
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'
Merge branch 'Jordan' of https://github.com/tranlannhi/DayTrip into Jordan

Conflicts:
	app/controllers/trips_controller.rb
	config/routes.rb
Merge branch 'Jordan'
omg fixed bar
update
Merge pull request #11 from tranlannhi/newbranch

Newbranch
trying again