Unmerged changes. This is proabably going to create problems . . .
Merge branch 'master' of https://github.com/CliftonCunningham/QPE

Conflicts:
	calgary.tex