Made characters more flexible in placing, added more levels
Changed sprite reset to the safe version.
logmessage
another log message
More log messages + removal of total game delete
fixed? iscollision
character is soft
Merge branch 'master' into dev

Conflicts:
	Makefile
Added youwin and win condition
added dev options
stashing
Merge branch 'master' into dev

Conflicts:
	game.cpp
Fixed up conditions for reverting to hashtag sprite.
It doesn't actually change back, though no errors are returned.