Changes from Steve to S2.
Merge branch 'steve'

Conflicts:
	proj_description.tex
Merge branch 'master' of github.com:david-deboer/msip-2014