Merging.
Merge branch 'master' of https://github.com/JohnDickerson/EnvyFree

Conflicts:
	data/aaai2014.tgz