courtney is demanding a commit
basic start. Fixing blue haired girls merge conflicts then coming back to this
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
prototype examples
roof tiles
actual changes cuz I'm a derp
Merge branch 'fhmqpd/crcxwc/sprint3-4-major-refactor' of https://github.com/karrde00/trajan-online into fhmqpd/crcxwc/sprint3-4-major-refactor
adds senate functions to Game
Merge branch 'fhmqpd/crcxwc/sprint3-4-major-refactor' of https://github.com/karrde00/trajan-online into fhmqpd/crcxwc/sprint3-4-major-refactor
loads images
Merge branch 'fhmqpd/crcxwc/sprint3-4-major-refactor' of https://github.com/karrde00/trajan-online into fhmqpd/crcxwc/sprint3-4-major-refactor
changed a variable name......in 400 places
getting gameboard working
Merge branch 'fhmqpd/crcxwc/sprint3-4-major-refactor' of https://github.com/karrde00/trajan-online into fhmqpd/crcxwc/sprint3-4-major-refactor
make selectTray and lineUp work refactored
got placeMarkers working
get senate action working in refactor
add in forum logic, not functional
fix merge conflicts