third commit
Merge branch 'master' of https://github.com/joseninogarcia/TL-Web-Page

Conflicts:
	README.md
	css/generalContentBlue.css
	js/HoveringModePlugin.js