3
Merge branch 'master' of https://github.com/marianoan/Presentation_Developer_exam

Conflicts:
	js/AddTemplate.html
	js/app.js
	js/main.js