Renamed preorder to orders
Fixed conflict on checkout.html.erb
Merge pull request #37 from DavidMMelin/master

Renamed shit