delete button
resolve conflicts
resolve conflicts
Merge branch 'remove-button' of https://github.com/redswaggon/red-wagon into like-button
little x button works
Merge branch 'like-button' of https://github.com/redswaggon/red-wagon into like-button