#185 Petits canvis
Merge branch 'devel' of https://github.com/eloipuertas/ES2013Dijous into devel