changes to math mode
Fixed bibtex conflict
Merge branch 'master' of https://github.com/aukejw/PIST into HEAD