mfwall2.c
Merge branch 'master' of https://github.com/mah00/mfwall2

Conflicts:
	mfwall2.c