Fixed merge conflict.

Makefile

main.py

report/report.tex

src/dag.py

src/dataflow.py

src/dominator.py

src/liveness.py

src/optimize/__init__.py

src/optimize/advanced.py

src/reaching_definitions.py

src/statement.py

test.py

tests/test_dag.py

tests/test_dataflow.py

tests/test_liveness.py

tests/test_optimize_advanced.py

tests/test_reaching_definitions.py

tests/test_statement.py