delete button
resolve conflicts
resolve conflicts
Merge branch 'master' of github.com:redswaggon/red-wagon into remove-button
Merge branch 'remove-button' of https://github.com/redswaggon/red-wagon into like-button
gemfile lock
Like almost works.
little x button works
Merge branch 'like-button' of https://github.com/redswaggon/red-wagon into like-button
Like button works
Merge branch 'like-button' of github.com:redswaggon/red-wagon into like-button
add inverse relationships to users
killed.
Merge branch 'remove-button'
Merge branch 'self-ref-tables' of github.com:redswaggon/red-wagon