i can\t even rememberm
Merge branch 'master' of github.com:Maome/cs492
admin settings updated
adminposts and adminsettings updated
Merge branch 'master' of github.com:Maome/cs492
fixed merge