File merges into ErlangMix.R

Merged John's changes into ErlangMix.R, removed erlangmix_jc.R
Merged plottermix.R into ErlangMix.R, as requested by the assignment (I
think). Left plottermix.R in git