adding two files
adding two new files to master
Merge branch 'admin'