Lots of stuff
Merge branch 'master' of github.com:sindreij/efmm

Conflicts:
	zeroplayer/todo.txt