Merge branch 'ssing'

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

Conflicts:
	C1S1.tex
	C1S3.tex
	Makefile
	main.tex