Merge.
Merge branch 'master' of https://github.com/rockwolf/cpp

Conflicts:
	nedry/menu.cc

The damn loop still doesn't work.