lala

lala
Merge branch 'master' of https://github.com/skarlos11/edoguia

Conflicts:
	style.css