versió 201311121243
201311121245
201311121309
Merge branch 'master' of https://github.com/dc1314daw2/prjava01