added same two tests for a logged in, non-admin, user
my rebase added too many links, but they are fixed now
Refactor assets
Merge branch 'master' of github.com:Tmee/Dinner-Dash
Bump assets version
Merge pull request #272 from Tmee/lists

Lists
Fix HTTPS issue, blow away cache
cleaned the photos
Remove unused assets
Merge pull request #273 from Tmee/clean_photos

cleaned the photos
Actually include our styles in the manifest
pulling
heroku business
fixed duped header
Merge pull request #274 from Tmee/fix_header

fixed duped header
Merge pull request #275 from Tmee/testing

added same two tests for a logged in, non-admin, user
Merge pull request #276 from Tmee/fix_failing_tests

my rebase added too many links, but they are fixed now
we added business intel to models
redone admin dashboard, no style yet
git stuffs