proposal_test

XZ: what if we simultanesouly work on the same document? Will the changes be combined? 

LaTeX document

This is a test

This line added on 8/12/2013 by XZ

This line added locally. Let's see how this can be updated. XZ: 8/12/2013.


Mike's modification!