StyleFixes
ColoresIncreibles
Merge branch 'nuevosfeatures' of https://github.com/bbardelli/prode2014 into nuevosfeatures