Conclusion/simple
Merge branch 'master' of https://github.com/paul-Young/YAP2014

Conflicts:
	paper/main.aux
	paper/main.blg
	paper/main.log
	paper/main.pdf
	paper/main.synctex.gz