cleaned up code, added license
Merge branch 'master' of github.com:Zolmeister/senshi