Clean gemfile
Update Gemfile
Add MarsWeather model; Add MarsWeather scrape rake task
Add chart.js functionality
Add jbuilder to Gemfile
Add jbuilder functionality.
jbuilder data going into chart.js
Resolve merge conflicts between marsweather and master
Add jbuilder for weather
Gemfile update
Add Chart.js functionality
Chart shows only when flight selected
Precompiling assets for Heroku.
Begin confirm info stage. Dual bind amenity select with info confirmation pane. Next: Update form with dual binding on info conf pane.
Resolve merge conflict
Merge resolve
Merge conflict fix
Add tabs to passenger info, layout confirm page. Still needs update button and form and finalized layout
Merge branch 'tablet-redesign-a' of https://github.com/bensbigolbeard/marsattracts into confirm-pg-merge

Conflicts:
	app/assets/stylesheets/flights.css.scss
	app/views/flights/index.html.haml
Merge branch 'tablet-redesign-a' of https://github.com/bensbigolbeard/marsattracts into confirm-pg-merge

Conflicts:
	app/assets/stylesheets/flights.css.scss