edit marcos.txt
Merge branch 'master' of ssh://github.com/jeancwes/globulus