Admin can add user
Admin/users_controller.rb showing as 'untracked'
Merge branch 'master' into admin-dashboard-users
Admin can now create admin users, overriding default user role
nicer styling for item show page
Merge pull request #122 from ianderse/jessica

added upload image back in
add bottom border to menu items
Admin can edit his/her personal info and change user's role
added images for use

added order model controllers
fixed homepage images
added order info to controllers, and view. WIP
Merge pull request #127 from ianderse/jessica

added event calendar
fix tests
small changes to order
merge conflicts