Merging
Merge pull request #5 from jackieiscool/rake

Rake Task
merge conflict.
merge conflicts.
clearing seeds conflict.
clearing out junk.
replace seed file I wacked.
cleared merge conflict text.
Adding movie prices to seed file.
validations on flight
Merge pull request #6 from jackieiscool/validations

validations on flight
Fix price/flight things on ean.rb
Merge pull request #7 from jackieiscool/fix_prices

Fix price/flight things on ean.rb
Touch up rake task
fix ean
Add styling
nothing much
fix merge error
fix merge conflic
make production work