Local updates from iMac ?
pick up remote changes
 2 * * * /Users/andy/bin/backup_mysql.sh > $HOME/backups.log 2>&1
Merge branch 'master' of github.com:aelster/CIM243-1

Conflicts:
	cc/index.html
	tripsmart/index.html
I'm believing my laptop.  I did a forced push from there
Merge branch 'master' of github.com:aelster/CIM243-1