More Styles
Merge branch 'master' of https://github.com/rricard/tp-xml

Conflicts:
	src/stylesheets/style.css
Merge branch 'master' of https://github.com/rricard/tp-xml