no change
resolve conflict
Conflicts:
	assignment_1/src/GzipProcess.java
	assignment_1/src/Serializer.java
bug fix for serializer