styling is more uniform throughout the app, nav bar is styled more
fix merge conflicts
Merge pull request #77 from devdame/import_data

Import data