Updated Player
Merge branch 'master' of https://github.com/FJ6855/Project
test commit, fixed merge Block.h
Conflicts:
	Block.h