mac commit
 conflicts fixed
Merge remote-tracking branch 'origin/master'
merge conflicts fixed
more DS stores
Merge remote-tracking branch 'origin/master'
local file changes on iMac
Merge remote-tracking branch 'origin/master'
Basics of markov data table