Update 20140616
Merge branch 'master' of https://github.com/JavierGarciaD/AlgoRepo.git