initial commit and merge
Merge branch 'master' of https://github.com/crownyx/capoeira