Merge pull request #12 from amyg225/aa-config

active admin config
active admin config 2