Solucion Gitihubu
Merge branch 'master' of https://github.com/danibram/danux

Conflicts:
	public/semiems/js/pinta_arm.js

Lio Conmigo mismo Solucionado!!
Merge pull request #11 from aitoroses/master

Sabado work
Merge pull request #12 from danibram/master

Sabado Start