Picking up and dropping boxes
Merge branch 'master' of https://github.com/apartmentlist/listyswarm

Conflicts:
	lib/agent.rb
	lib/world.rb
	lib/world/synchronized_world.rb