Wrote javadoc for the canMovePlayer-method and put some put not functional code in there.
Deleted the blockLayer variable from the model and changed so that every method using it would get the blockLayer from map instead
Fixed so the player cannot walk into blocks when pulling. For som reason it works also when lifting and walking through a block from the left, but buggy when coming from the right.
Fixed merge conflict to master