removed admins folder and controllers
finishes adding buttons for register form
fixes merge conflicts
Merge branch 'chadbrading-master'
Fixed broken tests