hw2
Update ChangeLog

Updating ChangeLog after HW2
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
Merge pull request #3 from polavar3/hw2

Hw2