merging
resolve merge conflicts
Styling Dashboard View with Modals
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #52 from JParker85/release-1

Styling dashboard and creating Modals