add trajan arch in start position
add ship tile
add trajan tiles
resize tiles
add more trajan tiles
merge conflicts
Merge branch 'crcxwc_sprint3'

* crcxwc_sprint3:
  add more trajan tiles
  resize tiles
  add trajan tiles
  add ship tile
  add trajan arch in start position
Merge branch 'master' into fhmqpd/crcxwc/sprint3-4-major-refactor

* master:
  add more trajan tiles
  resize tiles
  add trajan tiles
  add ship tile
  add trajan arch in start position