mege: changed code to set working directory - so that the code is more easily ported from one computer to the next

Merge branch 'master' of github.com:ebimodeling/sugarbag

Conflicts:
	code/creatingRdata.R
merge

Merge branch 'master' of github.com:ebimodeling/sugarbag

Conflicts:
	code/creatingRdata.R