included avg positions & velicities to the merge tree & other minor changes
resolving conflicts
add example code for tutorial fot 2013 NM Supercomputing Challenge