do this work if two person make changes

at the same time?
try again?

will this work
code sync
Merge branch 'master' of https://github.com/kaymoore/Moore-Summer14

Conflicts:

20120821-BY4743/analysisOn20120821BY4743/fcs.DHRDHE.By4743.20120821.FL1-
3marginal.pdf

20120821-BY4743/analysisOn20120821BY4743/fcs.DHRDHE.By4743.20120821.FL1-
3scatter.pdf

20120821-BY4743/analysisOn20120821BY4743/fcs.DHRDHE.By4743.20120821.SSC-
FSC.pdf

20120821-BY4743/analysisOn20120821BY4743/fcs.ONDHR.By4743.20120821.FL1-3
marginal.pdf

20120821-BY4743/analysisOn20120821BY4743/fcs.ONDHR.By4743.20120821.FL1-3
scatter.pdf

20120821-BY4743/analysisOn20120821BY4743/fcs.ONDHR.By4743.20120821.SSC-F
SC.pdf
code