no change
Merge branch 'master' of https://github.com/LuiTest/proyecto
logout button added to the menu.jsp