update map and water tiles
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/polar-bear-panic
resolve merge conflict with master
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/polar-bear-panic
update CSS + background image
Merge pull request #45 from CothOmega/master

update CSS, add background image tiling