no change
Merge branch 'master' of https://github.com/scriptkid85/DS640.git

Conflicts:
	assignment_1/src/GzipProcess.java
Merge branch 'master' of https://github.com/scriptkid85/DS640.git

Conflicts:
	assignment_1/src/GzipProcess.java
gzipProcess sleep time fix