Noatino/trabajoFinal — pull request #3 by faniaP (2014-11-12 23:08:39+00:00)
Title: merge manual

Before the merge