no se que cambie :S
Merge branch 'master' of github.com:DavidVValdez/lab

Conflicts:
	image-viewer/js/ImageViewer.js
resuelto el conflicto
agregada toolbar