Try fix problems
Do not use as it is is...
Fix bugs to challenge someone
Merge branch 'master' of https://github.com/yoannmoranville/speed-pyramid

Conflicts (resolved):
	src/main/webapp/WEB-INF/jsp/pyramidView.jsp
	src/main/webapp/js/pyramid.js
Add things that were deleted