.
Merge branch 'master' of https://github.com/carloslack/Detour

Conflicts:
	README.md