added note about compiler branch
Merge branch 'master' into compiler

Conflicts:
	README.md