test timed method
Merge branch 'master' into client_back_end
client calls completed
Merge branch 'master' into client_back_end

Conflicts:
	test/integration/IntegrationTest.java
tabs to spaces
Merge pull request #23 from ollyjshaw/client_back_end

Client back end