gitignore test100500
add admin part
merge
merge