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
 fixed show page
Merge pull request #100 from JustinRParker/release-1

Merging dashboard with release-1