finished auth friends
fixed routing merge
fixed routing merge
fixed routing merge
added activeadmin
added activeadmin
Merge branch 'master' of github.com:Chesscademy/App into francis
fix to devise login problem, spiced up the admin model a little