rails 3 question app
Merge branch 'master' of github.com:CodeFellowsOrg/three_year_old