init
admin pages/categories
.gitignore conflict