re#12 LARA commit 1
re#12 LARA commit 2
New title for index
New font-color
Merge pull request #1 from piltrafilla/features/lara

Features/lara
Merge pull request #2 from veronicasandoval/features/f2

Features/f2
Merge remote-tracking branch 'alfonso/features/f1' into features/carlos

Conflicts:
	css/style.css
	index.html