day2 revised Zita
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pages/seq_discriminative/seq_discriminative.tex
	pages/sequences/decoding.tex
day 2-3 revised
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pages/seq_discriminative/seq_discriminative.tex
	pages/sequences/decoding.tex
seq_discriminative

seq_discriminative minor changes Zita
ENH Remove unnecessary settings

This is all pre-configured now
Started Day 6.
Added footnote about generators on Day 5.
conflicts solved zita.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pages/seq_discriminative/seq_discriminative.tex
	pages/sequences/pos-induction.tex
	pages/sequences/pos.tex
conflict with seq_discriminative solved.
Merge pull request #32 from zmarinho/master

seq