updated readme
fixed merge
admin page