License
Merge branch 'master' of https://github.com/sclausson/ducking-octo-ninja

Conflicts:
	LICENSE