rest test
Teracross: fixed admin.
Fixed admin on master branch and rebased view branch with master.
Merge branch 'view' of github.com:Sassafrass6/cs373-idb into view
Rebase local to reflect what is on github.
Update.