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

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