oi
oi

oi
Merge branch 'master' of https://github.com/jsfrocha/ProjectoES

Conflicts:
	src/main/java/pt/ulht/es/cookbook/controller/HomeController.java
	src/main/webapp/WEB-INF/jsp/home.jsp

ok commit