Testing git conflicts
Resolved merge conflict
Merge branches 'domenic' and 'master'