Added modal edit form (for those with admin permissions) to each slide
Merge branch 'temp'
style tweaks
Resolving merge conflict in css file