fixed login system
merged files
deleted a bunch of stuff
merge