fixed migration error
changed nav bar and fixed nav modals
changed styling
changed styling
a
Merge branch 'master' into samantha
Merge branch 'Samantha'
added stuff
fixed merge conflicts