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
Merge pull request #11 from jcward10/release-1-mailers

Release 1 mailers
seed data for participants, role_types, fests, ticket_types, admin login, volunteer login, and also changed fest table to name:string
Merge branch 'release-1' of https://github.com/festivit/festivit into release-1

Conflicts:
	db/schema.rb
consolidated google fonts in one line
Added complete field to submissions
Fixed merge conflicts in submission controller
undid the google fonts consolidation
Merge pull request #13 from rscottbradshaw/release-1

Conflicts resolved with seed data
Fixed seed merge conflict
Merge remote-tracking branch 'upstream/release-1' into release-1