Changes to be committed:
	modified:   index.php
	new file:   templates/Logged_Functions/afegir_seccio.php
	modified:   templates/Logged_Functions/processar_edicio.php
	new file:   templates/Logged_Functions/processar_nseccio.php
	modified:   templates/Logged_Functions/processar_publicacio.php
	modified:   templates/Logged_Functions/publicar.php
	new file:   templates/Logged_admin_window.php
	modified:   templates/Logged_functions.php
	modified:   templates/Logged_window.php
	modified:   templates/Login_window.php
Merge branch 'master' of https://github.com/PereBal/BD_II

Conflicts:
	index.php