Added a wandering diamonds pattern
Merge branch 'master' of https://github.com/ixchow/light-wall
Handled lots of merge conflicts
Conflicts:
	Makefile
	Patterns.cpp
	Patterns.h
one more stupid fix to the Makefile