Forgot to save a file from the earlier merge
Renamed the user_name column to username because it was bugging me :P
Merge branch 'renameUsername' into development