refactor build message to move it out of our router type function
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/fire/Server.java
fix FitNesse test