compiles
added gitignore
changes
conflicts resolved
changes
Figures
more figures
script for producing xfigtex for figures