Periodic check in.
Some edits.
Merge branch 'master' of https://github.com/david-deboer/msip-2014

Conflicts:
	proj_3pager.tex