comit inicial 18/05/2013
Merge branch 'master' of https://github.com/gugol/workspaceJA