Created edit page
Password Reset almost complete
merged

anch 'master' into travis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
If user is admin, route to admin view
Made admin view
Small change to password reminder message
Committing merge changes

small errors in committing merge, have to do it manually
manual merge
Admin.blade will be modeled after user dashboards
manual merge
Added data to be passed to admin page
Created view all users modal
merged

anch 'master' into travis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Redefined variables for admin page
Admin page completed
Small changes to variables
Tweaks to admin page
manual merge
Made admin.blade better
Deleted/moved files