some comments and stuff
Merge branch 'master' of https://github.com/elpueblo88/strategy