a
Merge branch 'master' of https://github.com/PereBal/BD_II into PereBal

Conflicts:
	index.php
	templates/nav.php

 Changes to be committed:
	modified:   index.php
	modified:   public_html/css/main.css
	modified:   templates/Logged_Functions/afegir_seccio.php
	modified:   templates/Logged_Functions/editar.php
	modified:   templates/Logged_Functions/publicar.php
	modified:   templates/Login.php
	modified:   templates/Register.php
	modified:   templates/nav.php