working on collision detection
finished collision detection
shift click to change color
change colors
Merge branch 'master' of https://github.com/gratimax/virophage

Conflicts:
	src/main/java/virophage/core/DeadCell.java
	src/main/java/virophage/core/Tissue.java
	src/main/java/virophage/render/HexagonNode.java
	src/main/java/virophage/render/RenderTree.java
back to the original we made in class