Merge branch 'master' of github.com:mgaitan/trestapas
readme
rst ftw!