db migrate after pulling thomas branch
added gem for active admin in gemfile
currently in active admin
added user model to active admin
solved conflicts
active admin working
Merge pull request #16 from tomsword/active-admin

Active admin