kill origin
Merge remote-tracking branch 'origin/master' into danger

Conflicts:
	project/readme