modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   deleteCache.sh
	modified:   applications/controlies/controllers/gestion.py
	new file:   .gitignore
	modified:   applications/controlies/avahiClient.py
	modified:   applications/controlies/modules/Laptops.py
Merge branch 'master' of https://github.com/manumora/controlies
	modified:   applications/controlies/modules/LdapConnection.py
	modified:   deleteCache.sh