update
Merge branch 'master' of https://github.com/scivm/copilot

Conflicts:
	files/README