No major changes
Resolves conflict
Resolves gitignore merge conflict
Creates Restaurant#review_average method
Halfway works through the jQuery problem