added accepted_friends
homepage_links cucumber tests fixed
committing merged user.rb
changed to haml and added profile features
Merge branch 'master' of github.com:ronde-app/ronde
Deleted some unnecessary files.
Merge branch 'master' of github.com:ronde-app/ronde
homepage_links cucumber tests
rake cucumber files
deleted extra homepage feature
updated step definitions for consistency
added friend.feature cucumber tests (no step defs yet)
deleted auto-generated rspec and got rspec to work
adding friend cucumber tests
Merge branch 'master' of https://github.com/ronde-app/ronde
Rake cucumber works yay
Updated schema. Rake spec works too.
fixed some duplicate code
This file has been broken up into other files
can now add friends, reject friends, remove friends, etc.