Username added to User model. Users can log in with either email or username. Tests still do not work, must revisit