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 height of cards
added notices, alert and headers to all slim views
fixed merge conflicts
made all view slim with alert and notices and merged
Merge branch 'release-1' of github.com:festivit/festivit into everynew
Merge pull request #98 from festivit/dashboard

Dashboard
fixed team page names issue
Merge branch 'release-1-cards' into release-1

Conflicts:
	app/assets/stylesheets/base/_variables.scss
	app/views/participants/show.html.slim
Merge pull request #99 from sebarmano/release-1

Added card color
 fixed show page
Merge pull request #100 from JustinRParker/release-1

Merging dashboard with release-1
fixed merge conflict