bug fixes
Merge branch 'master' of https://github.com/seanwooj/take_home
nested resources