cena
Merge branch 'dev' of https://github.com/TiagoPinto/1projectotreino into dev

Conflicts:
	trello/app.js
	trello/index.html