Update ChangeLog

Changes made for HW1
Merge branch 'master' of https://github.com/polavar3/cse491-serverz into hw2
Merge branch 'hw2' of https://github.com/polavar3/cse491-serverz into hw2

Conflicts:
	ChangeLog