testing fix to plan file
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner
fix bug
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner

Conflicts:
	src/frontend/org/qcri/PartitioningPlanner/Controller.java