mac
Merge branch 'master' of ssh://github.com/wadaries/World

Conflicts:
	Research/thesis13/dissertation.lof
	Research/thesis13/dissertation.pdf
mac