Revert "test3"

This reverts commit 8700f1f146ed1a734f2ee42593e8ced32c57d53e.
Merge remote-tracking branch 'origin/master'

Conflicts:
	borogit_test.txt
Merge branch 'master' of https://github.com/dceriman/viva-chile