lmacha02/sp2-cw3-2014 — pull request #9 by lmacha02 (2014-12-21 18:44:26+00:00)
Title: Merge pull request #6 from lmacha02/luisDevelopment

merge 20/12/14