Merge pull request #36 from dazm12/release-1

Fixed migration issue
merging to fix errors
Getting styles to work correctly
Merge pull request #37 from JParker85/release-1

Getting styles to work correctly
Merge remote-tracking branch 'upstream/release-1' into release-1