Merge branch 'Andy' into develop

Conflicts:
app/controllers/records_controller.rb
app/models/game.rb
app/models/record.rb
app/views/records/_form.html.erb
app/views/records/index.html.erb
db/schema.rb