Log In Screen Stuff Added

Also, there's a million conflicty things about files I never touched. Have fun. You da best.