changed craig to greg
Merge remote-tracking branch 'origin'
sync
Merge remote-tracking branch 'origin/master' into wes