bug fixing and reordering
Merge branch 'master' into refactor/updateSlides

Conflicts:
	slides/slides.md
Merge pull request #1 from isaacroldan/refactor/updateSlides

Bug fixing, reordering and new stuff in slides