Fixed fugacity calculation to account for Pressure etc.
Added Patm as input argument in documentation file
Replaced missing lines that were deleted by mistake in last update to carb.Rd
Added Patm to output data frame
Added Patm as argument to buffer.R
squared '(1-x2)' term if fugacity coeff, consistent with f2pCO2.R and p2fCO2.R and Weiss (1974)
Merge pull request #1 from jamesorr/fugfac

squared '(1-x2)' term in fugacity coeff, consistent with f2pCO2.R and p2...
Merge branch 'fugfac'
Updated Description and ChangeLog
In preparation of 3.0.2

See ChangeLog, clean-up, commented examples in carb and buffer which
prevented compilation
Minor changes
Updated numerous Rd files and functions

To be consistent with the recent changes made by Jim
Bug fix in carb and buffer

 which prevented some examples to run
Merge branch 'debug'
boron formulation changed to u74

test in carb
Boron formulation to u74

Changed everywhere, in functions and help files
ChangeLog updated
Merge branch 'debug'
Minor
Merge branch 'master'

Conflicts:
	.Rhistory