Fixed Customer.java, next git iteration of TextReadIn.java
Fixed my merge conflict