add active admin
merge gitignore