update todo
don't allow user to see anything below the water
update instructions screen; change from 'x' to ' ' for launch

Also, fix bug where you could jump when not on the game screen.
add getNumTargets() method of Target

(Will be needed to know where to put the g++ sorcerer.)
implement g++ sorcerer

Right now the sorcerer is a green box that doesn't do anything, but it
exists. We still need to add hitbox collision detection (it has a
hitbox), a reasonable texture, and movement back and forth.
Merge branch 'master' of https://github.com/130610/sd-project

Conflicts:
	source/start.cpp

The program doesn't work right now because changes need to be pulled,
but I can't stash or pull with unresolved merges.
Merge branch 'master' of https://github.com/130610/sd-project

This resolves the problem mentioned in previous merge commit.