Merge pull request #38 from danibram/master

Todo Mergeado y en principio funcional!
aaa
wtf?
Merge pull request #39 from danibram/master

Cambios Fresssssssssssssshcos
layout OP
Merged succesfully
Issue
doh
Upload works
Upload works 1
casi lo tengogit add --all
casi lo tengo con dani
casi lo tengo con dani 2
Merge branch 'master' of https://github.com/aitoroses/danux into aitor_dev

Conflicts:
	public/semiems/js/src/pinta_arm-ck.js
	public/semiems/js/src/pinta_arm.js