added devise in gemfile nothing else
added regions form views and places form views, edit, next to add update and destroy
added regions views crud, added itenerary models and controller, empty but added migration for itenerary
added itinerary and its corresp views con mods
changes to controller
added truly asia seed itinerary list mockup, then added a show view for it listing pictures through flickraw in itinerary controllers.rb
updated conflicts; devised related conflicts
added itineraries
updates from devise
what
added attraction.rb and activities.rb and join table attraction_activities.rb, no devise relation in there
added bootstrap gem and requirements, added basic markup and classes to application.html.erb ,fixed devise all OK and working operational
merge confict, same as previous commit otherwise