Messed with devise - admin / password etc
removed merge conflict in User.rb (no more password upon creation)