KJG 3/13/2014

Compiling test - fixed some typos
Merge branch 'master' of https://github.com/laserpewpewpew/teamb

Conflicts:
	PS3-f1.pdf
	PS3-f2.pdf
	PS3.Rnw
	PS3.tex