2
Merge branch 'EXX'

Conflicts:
	README.md