Dissenys
Merge branch 'master' of https://github.com/RogerTorra/Projecte_web
	modified:   web/gestorFestes/templates/base.html
	modified:   web/gestorFestes/templates/ciutat.html
	modified:   web/gestorFestes/templates/ciutats.html
	modified:   web/gestorFestes/templates/festa.html
	modified:   web/gestorFestes/templates/festes.html
	modified:   web/gestorFestes/templates/festesLocal.html
	modified:   web/gestorFestes/templates/index.html
	modified:   web/gestorFestes/templates/local.html
	modified:   web/gestorFestes/templates/locals.html
	new file:   web/web/media/static/css/style.css
	new file:   web/web/media/static/css/style.scss
	new file:   web/web/media/static/fonts/dimitri.ttf
	new file:   web/web/media/static/fonts/dimitri2.ttf
	new file:   web/web/media/static/images/back.png
	new file:   web/web/media/static/images/bar.png
	new file:   web/web/media/static/images/hand.png
	deleted:    web/gestorFestes/templates/static/css/style.css
	deleted:    web/gestorFestes/templates/static/css/style.scss
	deleted:    web/web/media/images/back.png
	deleted:    web/web/media/images/bar.png
	deleted:    web/web/media/images/hand.png
	deleted:    web/web/media/images/readme.txt