Added environment code to equations.tex.
Fixed minor merge conflict in equations.tex.