new file:   web/gestorFestes/static/css/style.css
	new file:   web/gestorFestes/static/fonts/dimitri.ttf
	new file:   web/gestorFestes/static/fonts/dimitri2.ttf
	new file:   web/gestorFestes/static/fonts/fontawesome-webfont.eot
	new file:   web/gestorFestes/static/fonts/fontawesome-webfont.svg
	new file:   web/gestorFestes/static/fonts/fontawesome-webfont.ttf
	new file:   web/gestorFestes/static/fonts/fontawesome-webfont.woff
	new file:   web/gestorFestes/static/images/back.png
	new file:   web/gestorFestes/static/images/bar.png
	new file:   web/gestorFestes/static/images/hand.png
	modified:   web/gestorFestes/templates/base.html
	modified:   web/gestorFestes/templates/festa.html
	modified:   web/gestorFestes/templates/festesLocal.html
	modified:   web/gestorFestes/templates/login.html
	modified:   web/gestorFestes/views.py
	new file:   web/web/media/imatgesFesta/row_1.jpeg
	modified:   web/web/urls.py
Merge branch 'master' of https://github.com/RogerTorra/Projecte_web