Changed again...
Merge branch 'master' of github.com:retn/fuzzy-ninja