small stuff
  starting walls
Merge branch 'master' of github.com:twist/of
Merge branch 'master' into dialog

Conflicts:
	include/game.h
	src/game.cpp
	src/sdl_wrapper.cpp