made simultaneous changes to document
disconnected simultaneous changes - let's hope I am merging correctly
Merge branch 'master' of github.com:mkness/TheCannon
merge changes
minor changes
changes to code not sure what is being merged
Merge branch 'master' of github.com:mkness/TheCannon
just lost datadriven.tex with crash
trying to recover datadriven.tex
document changes
merging