rm
Merge commit '8134267'

Conflicts:
	README