Locked Up PFs
Merge branch 'master' of https://github.com/h2r/affordances

Conflicts:

src/NewMineCraftDomain/src/minecraft/MinecraftBehavior/MinecraftBehavior
.java