adding users settings, settings/edit, and orders pages
initial setup for admin
resolving merge conflicts
Merge branch 'master' of github.com:objectParadigm/diner-ninja-dash into admin-users
removing duplication ins master
Merge branch 'master' of github.com:objectParadigm/diner-ninja-dash into admin-users
user admin section up and running
fixing broken specs
git co spec/features/user_spec.rb
commenting out deletion test
admin/users namespaced
resolving merge conflict
Merge pull request #44 from objectParadigm/admin-users

Admin users
resolving merge conflict