controllers included
Merge branch 'master' of https://github.com/jspencersharpe/Wishlist