Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/gracaninja/lxmls_guide
Scaped "_" in text

The statement \texttt{en_perline001.txt} broke pdflatex. Scaped the "_" to avoid this
Merged with upstream/master
Merge with upstream master

kept changes on pages/bigdata/em.tex
Merge branch 'master' of https://github.com/ramon-astudillo/lxmls_guide
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pages/bigdata/em.tex

Undid the changes on Day6, since it stil is in a draft stage
Merge pull request #36 from joanappardal/master

Makefile
Merge branch 'master' of https://github.com/gracaninja/lxmls_guide
Added Naive Bayes comment
Merge pull request #38 from ramon-astudillo/master

Added comment to exercise 1.3
Merge remote-tracking branch 'upstream/master'