finished merging with 3D branch. All 2D functionality should be working as before. No logic changed there
rename brush to cube as basic 3D object, modified other files to match this
changed Sessions to easily switch back and forth between 2D and 3D views
fixed merge. controls work
fixed unused canvas element
fixed sea's depth
fixed controls when reenabling 3d, check for zoom distance to origin
finished changing controls, making sure that enabling disabling complexgame will properly load the canvas. added water light with SOME issues at certain angles.
check for collisions when making a move forwards (and to any other side, for that matter)
minor change, deleting comments
Added a needed check for complexGame
Merge branch 'master' of https://github.com/amedeedaboville/battleships