merging
Merge remote-tracking branch 'upstream/release-1' into release-1
merging to get submissions view
basic importer working for online_order_id & date_time
adding devise views
rename join tables and models. add Orders controllers, routes and views.
add comments to orders. revert importer
resolving merge conflicts
moved bitters base folder to the stylesheets folder
updated the sass _variables file
consolidated google fonts in one line
undid the google fonts consolidation
Merge pull request #13 from rscottbradshaw/release-1

Conflicts resolved with seed data
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #14 from obeid/release-1

Stylesheets and everything is loaded up now
merged tickets and orders.
merging
merge with talal
Merge pull request #15 from JParker85/release-1

Stylings
merged conflicts. renamed tables.