Added password hash code
Added userStats data to user creation code
Merge branch 'Kevin' of https://github.com/MacSalty/spaceunionweb into Kevin
Added userStats creation to create AddUser()
fixed merging conflict in index.cshtml
updated encryption
fixed merging conflicts
Updated login code, added server-side validations for login
fixed merging conflicts
Stage 3 complete
fixes
Merge fixes
broken
fixing merging conflicts
merge nightmare aftermath
merge conflicts fix
fix?
fix?
fixed missing files
fix merge conflicts