>_<

Conflicts:
	NOTES.txt