up until AA2
Merge branch 'master' of https://github.com/mikt/ProgrammingWorkshop

Conflicts:
	LaTeX/SearchCmd4.tex
	LaTeX/main.log
	LaTeX/main.synctex.gz