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
added notices, alert and headers to all slim views
fixed merge conflicts
 Working on Modal carousel
Almost done with carousel
made all view slim with alert and notices and merged
Merge branch 'release-1' of github.com:festivit/festivit into everynew
Merging with Jeremy
Merging with Jeremy
fixed team page names issue
Merge pull request #99 from sebarmano/release-1

Added card color
Working carousel in Modal
Merge remote-tracking branch 'upstream/dashboard' into dashboard