CM - initial syncing algorithm
a bunch of stuff
about to merge
merged with chris
Merge pull request #1 from ChrisTheTree/jmok-android

Jmok android