time testing
Merge branch 'master' of https://github.com/simoncomputing/Ghost

Conflicts:
	src/main/java/com/simoncomputing/ghost/generator/RecordGenerator.java
	src/test/java/GeneratorTest.java

target/classes/com/simoncomputing/ghost/generator/RecordGenerator$1.clas
s
	target/classes/com/simoncomputing/ghost/generator/RecordGenerator.class
	target/test-classes/GeneratorTest.class