...
Merge branch 'master' of github.com:marcmaxson/djotjog

Conflicts:
	lda-gibbs-anytext.py
...
...
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog
Merge branch 'master' of github.com:marcmaxson/djotjog