AJP 4:31
Merge branch 'master' of github.com:ajpuckett/PAC42_deltad

Conflicts:
	main_Deltaq.log
	main_Deltaq.pdf
delete binary files from git tracking