added capyabra to gemfile
added capyabra to gemfile
moved features over
moved features over
moved factories over
addd factory girl to gem file
copy over support folder
passed: login and view profile
pass
fix merge conflict, empty line
removed another empty line merge conflict