Users can now log in with user_name and email but I could not make one text box for both
Merge branch 'master' of http://github.com/LukeShu/leaguer