Merge pull request #2 from fakestuff/hw2

Hw2
Update ChangeLog
Merge branch 'master' of https://github.com/fakestuff/cse491-serverz

Conflicts:
	ChangeLog
pull from hw3
beta hw4
buggy version
buggy version
add jinjia2
renew changelog
Update index.html
Update index.html
update
Merge pull request #6 from fakestuff/hw4

Hw4