lvn
Merge branch 'master' of https://github.com/wadaries/World

Conflicts:
	Research/synthesis/main.log
	Research/synthesis/main.pdf
lvn