Added integration tests

still need to update readme.txt, renamed README.md to run instructions
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/metrics/setup/Main.java