Ajustes ABOUT/ TODOLIST
Merge branch 'master' of https://github.com/luiscoms/ToDoList

Conflicts:
	web/PROTOTIPO/img/icons.png