Resolve more merge conflicts

README.md

@@ -56,6 +56,13 @@ There are a few options supported,
 
     $ python fitsync.py --help
     
+=======
+### Cron
+
+The included `cron.sh` script can be used to keep your Fitbit and Google Fit data in sync automatically.
+Simply add the following line to your crontab to run the job daily at 11:00.
+
+`00 11 * * * /path/to/fitsync/cron.sh`
 
 ## See your data
 

cron.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+pushd $DIR > /dev/null
+virtualenv env > /dev/null
+source env/bin/activate
+./fitsync.py
+popd > /dev/null