hmm
stash gitignore
attempt to resolve trivial merge obstacles
Merge branch 'master' of https://github.com/jacobmenick/AlifeRepo

update from teh
I believe I have now successfuly built an adj mat