Overwrite this
Merge branch 'master' of github.com:ambivalentduck/psychicRobot

Conflicts:
	Paper1/paper1.tex
	Paper2/compactVersion.tex
	Paper2/krlsProofsAndToys/main.m