Merge branch 'dashboard' of https://github.com/festivit/festivit into dashboard
fixning merge
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merge pull request #106 from JustinRParker/dashboard

Dashboard fix
 fixed decline
Setting up accept and decline buttons based on submission.approve
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merge pull request #107 from JustinRParker/dashboard

Setting up accept and decline buttons based on submission.approve
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merging
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merge remote-tracking branch 'upstream/dashboard' into dashboard
 fixed email if statment
dashboard is working
 updates
 conflicts fixed tuesday 310
Merge pull request #115 from jcward10/dashboard

Dashboard
Merge pull request #116 from festivit/dashboard

Dashboard