added stuff 1
Merge branch 'master' of https://github.com/Guilleremo/rpg

Conflicts:
	RPG/public_html/CSS.css