just committing for kicks
merge conflict
win conditions/game freezes after winning
Merge pull request #6 from alistairhill/view

MERGIN FOR THE ONE TIME!