fixed merge conflicts
fixed merge conflicts
Merge pull request #1 from JustinRParker/dashboard

Dashboard
Merge branch 'release-1' of github.com:JParker85/festivit into release-1
Styling submission new
Styling submission new
Fixing Merge Conflicts
Fixing Merge Conflicts
Adjust dragonfly settings
Dropbox, Dragonfly adjustment
Minor adjustment to dragonfly
fix small change from heroku error
edit participant view to show make email required.
Fixed height of cards
added notices, alert and headers to all slim views
fixed merge conflicts
 Working on Modal carousel
Almost done with carousel
tweak to ternary
Merge remote-tracking branch 'upstream/release-1'