merged features specs, added user login
merge conflict