user rb comment deleted
merged features specs, added user login
merge conflict