mika

miikad
Revert "Revert "bla2""

This reverts commit 8feae276a60bd0687849e4efdb73bb33dca831ab.
Revert "Revert "Txt created""

This reverts commit 246d75fcd59f15494a64540780145626206895e0.
Merge branch 'master' of https://github.com/dceriman/viva-chile

Conflicts:
	jovana.txt