added delete compositions to user show
Merge branch 'development' of github.com:jonathanporras/spctrl into development
fixed merge conflicts in application.html. refactored controllers with mck