working
Merge branch 'master' of github.com:protective/Dat10

Conflicts:
	article/bin/index.aux
	article/bin/index.log
	article/bin/index.pdf