Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/AngelicaGuaman/Curso2014-2015

Conflicts:
	HandsOn/Group07/analysis.html
actualized analysis
actualized
Merge branch 'master' of https://github.com/AngelicaGuaman/Curso2014-2015 into AngelicaGuaman-master
Merge branch 'AngelicaGuaman-master'