Merge branch 'release-1' of https://github.com/festivit/festivit into release-1-mailers
moved bitters base folder to the stylesheets folder
updated the sass _variables file
 sudo added approval and approval email
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
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
merge with talal