Revert
Merge branch 'master' of github.com:pevargas/flaming-tribble

Conflicts:
	README.md