Conflictin changes to graph.js
Merge branch 'master' of https://github.com/polpolion/TheFatalisticGameOfLife