revised dat file to point to steve's examples  DEMO folder
Merge remote-tracking branch 'smartell/IPHC-developer' into IPHC-developer
Merge remote-tracking branch 'origin/IPHC-developer' into IPHC-developer

Conflicts:
	src/admb-code/iSCAM.dat
Testing calcSelectivities function
Fixed merge conflict with Chris Grandin's version
Updated .gitignore
Changed control and dat files for arrowtooth
Modified .gitignore
Merged S Martell's updates
Merge branch 'IPHC-developer' of https://github.com/robynforrest/iSCAM into IPHC-developer
Fixed merge conflicts
Change model controls for Arrowtooth.
Fix merge with  martell
committed changes
Fixed merge conflicts
Added Pcod data files
Working on P cod data file
Fix merge conflicts from martell
Fixed minor typo in iscam.dat
fixed merge conflict