testing github merge; add foo
Merge pull request #70 from Dovetail-Automata/gh-merge-test

testing github merge; add foo