cHANGED LOGIN AND SIGNUP
Modals added
Fix merge conflicts