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 pull request #43 from georgexzeng/master

finished instructions and game menus, inspected by Derek
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/polar-bear-panic
add jump and fishslap sound effects
Merge pull request #44 from garrettdalton/master

add jump and fishslap sound effects
update CSS + background image
Merge pull request #45 from CothOmega/master

update CSS, add background image tiling
modifying merge conflicts