working code on new transaction form
stuff
transaction.rb merge conflict resolved
application controller merge conflicts resolved
add friends to goals buggy but working code
Merge pull request #34 from ecasilla/goalshow

working but buggy code on adding friends to goals