tamadroid name changing
Merge branch 'master' of github.com:thorn0/tamadroid