Resolved merge problems
Merge branch 'SidRoberts-mvc-model'

Resolved merge problems