generate new rails project
fix merge conflicts
add posts and comments scaffolds, nest comments in posts in routes, add associations in models