Moving Start.java from test to main.
Merging Server with local