Parameterization 2 added to PIRmle
Fixed merge conflict

Merge branch 'master' of github.com:DMSwan/PIREstimators

Conflicts:
	PIR-APP/PIRmle scratch.R
	PIRapp.R