Merge pull request #1 from roguephysicist/master

bemese/master merged, first draft complete
Merge pull request #2 from roguephysicist/master

First draft done!
cambios globales, chon merge all
Merge pull request #5 from bemese/master

nueva nueva