Modify various files.

Modify bar. Add new paragraph.
Modify bar. Edit subtitle and intro paragraph.
Added social media info.
Fix issue#12232.

Delete problematic line on foo.
Delete paragraph on blah.
Add subtitle to foo.
Merge branch 'master' of https://github.com/felipecastro92/entrenamiento

Conflicts:
	foo.txt