fixed a small bug
Merge branch 'master' of https://github.com/Guntler/SDIS

Conflicts:
	SDIS proj1/log.txt
Merge branch 'master' of https://github.com/Guntler/SDIS