remove block to end conflicts
Merge branch 'master' into Colin-Dev

Conflicts:
	src/Block.java
Merge branch 'Colin-Dev'