whitespace

- just testing push notifications

README.md

@@ -72,6 +72,7 @@ characterization data
   * You can copy these to your laptop using scp to view them.
 
 
+<<<<<<< HEAD
 ## Parallel-NetCDF
 
 You can install Parallel-NetCDF on your laptop easily enough, or you can use
@@ -102,3 +103,4 @@ one can do I/O with Parallel-NetCDF.  We'll also explore attributes.
 
 We don't have any explicit hands-on exampels geared around the Game of Life
 discussed today, but if you want to experiment with I/O the code is provided here.
+