Slight change
Merge branch 'master' of https://github.com/h2r/affordances

Conflicts:
	papers/aaai_2014/aaai_2014.pdf