basic signin working
merged stash, conflicts resolved
remove unneeded file
conflicts resolved, merged