Testing stuff.
Modify README file.
Blah.
New file blah.txt.
Add foo file.
Merge branch 'dev/master'
Some file modifications.
Create file bar.
modified bar.
Work on foo.
Add paragraph to bar.
Blah working.
Merge branch 'dev/feature-x' into dev/master
Modify lista mercado.
Additions to test.txt.
Readme addition.
Merge branch 'dev/feature-x' into dev/master
Merge branch 'dev/master'