fixed merge conflicts
fixed merge conflicts
fixing merge conflicts
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita
add test for admin ability to edit own account
add test for deleting admin account
WIP
WIP
fixed merge conflicts
clean up comments
Merge branch 'master' into feature_tests
Merge pull request #107 from rNavarrete/feature_tests

Feature tests
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita
fixed current_user.nil bug on index orders view
Merge pull request #108 from rNavarrete/heroku_orders_page_bug

fixed current_user.nil bug on index orders view
Merge branch 'master' of https://github.com/rNavarrete/dinner_dash_frita