Fixed BPG.tex conflict & removed test file
Fixed advocacy.tex conflicts, removed *.log files from commits
Fixed conflicts in authors & climate_today
Fixed conflicts in climate_tomorrow
Fixed conflicts in glossary.tex
Fixed conflics in resources.tex
Fixed conflicts in titlepage.tex
Removed aux, log, out, & toc from commits