Merge pull request #74 from devdame/deploy_by_8

Deploy by 8
setting assets precompile to false to try to remedy the heroku rejection
Merge pull request #75 from devdame/assets_precompile_false

setting assets precompile to false to try to remedy the heroku rejection
styling is more uniform throughout the app, nav bar is styled more
reenabled assets precomplile
Merge pull request #76 from devdame/assets_precompile

reenabled assets precomplile
fix merge conflicts
Merge pull request #77 from devdame/import_data

Import data
unbroken css
deleting the files
Merge pull request #78 from devdame/import_data

unbroken css
Merge branch 'master' into deploy_by_8