yank07/WPM — pull request #4 by ccaballero646 (2014-04-12 02:03:50+00:00)
Title: version medio final 1ra iteracion

merge ccaballero-20140411 into master