user_controller
Merge branch 'master' of https://github.com/ecasilla/Moolah
public activity
goal activity feed
Merge pull request #31 from ecasilla/public_activity

Public activity goal create working
added logic for friend requests
let's be friends
Merge pull request #33 from ecasilla/Brad2

Friendship Logic
stuff
transaction.rb merge conflict resolved
application controller merge conflicts resolved
add friends to goals buggy but working code