Fixed id
Merge branch 'master' of github.com:liutuo/CS3213-Zope-HW4

Conflicts:
	app/assets/javascripts/main.js