Merging
Merging
merging
Settling Submissions view
Settling Submissions view
merging to get updates
resolving problems
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
resolving problems
resolving merge conflicts
cleared the contents of index.html.slim to avoid duplication
Merge branch 'release-1' of github.com:festivit/festivit into release-1
Merge pull request #31 from obeid/release-1

cleared index.html.slim of similar contents to application.html.slim
Merge pull request #32 from JParker85/release-1

Fixing Errors with database interface
Fixed some routes, pages
Fix merge, route conflicts