added login form stuff
added login features
merge