Working signup/ login
resolved conflicts
merge