LAs tece
Merge branch 'master' of https://github.com/fmorenor/TESTCODE

Conflicts:
	characters.html
	css/char.css