fixed bug 1111
new fix to bug 1111
nuevo cambio
Merge remote-tracking branch 'upstream/master'

Conflicts:
	NewFeature.txt
dddd
Merge branch 'master' into rama1

Conflicts:
	index.html
Merge pull request #17 from smurgolo/master

bug fixed 1111
laralalalalala
Merge pull request #18 from cbernat/rama1

Rama1