Add message about merging locally
Merge commit '40840056659ac4173adc270bee99cd4dd31151d8'

Conflicts:
	README.md