add active_admin
Merge branch 'master' of github.com:weijen/gurupu

Conflicts:
	db/schema.rb
fix .gitignore