Completed module X
Stupid conflict created by git example.

Conflicts:
	doc/notes.md