Merge commit 'cb61d94436c431def753440f05da7175da76c658'
Merge branch 'origin/test'
Removed ds store files
Minor pipe modification
Merge branch 'origin/master'

Conflicts:
	.classpath
	src/app/App.java
	src/app/Renderer.java
	src/app/Simulator.java
	src/app/WorldState.java
	src/app/messages/Message.java
	src/app/nodes/Node.java
	src/app/nodes/shapes/Pipe.java
Merge branch 'origin/test'