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

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

target/classes/com/simoncomputing/ghost/generator/RecordGenerator$1.clas
s
	target/classes/com/simoncomputing/ghost/generator/RecordGenerator.class
	target/classes/com/simoncomputing/ghost/hive/HiveData$1.class
	target/classes/com/simoncomputing/ghost/hive/HiveData.class

target/m2e-wtp/web-resources/META-INF/maven/simoncomputing.app/Ghost/pom
.properties