Merge branch 'ssing'

Conflicts:
	Makefile
	main.tex
Merge branch 'yzq'
Merge branch 'master' of https://github.com/SenSing/Programming-Guide

Conflicts:
	Makefile
	main.tex