added new sdl 1 sim
changes to makefile
Fixed Makefile merge

Merge branch 'master' of https://github.com/ixchow/light-wall

Conflicts:
	Makefile