Fixed merge conflict

.gitignore

Makefile

benchmarks/optimized/pi.s

benchmarks/wiki.c

main.py

report/Makefile

report/report.tex

report/rules.mk

run

src/dag.py

src/dataflow.py

src/dominator.py

src/liveness.py

src/optimize/__init__.py

src/optimize/advanced.py

src/optimize/redundancies.py

src/parser.py

src/program.py

src/reaching_definitions.py

src/statement.py