minor
Merge branch 'master' of https://github.com/CS411/cs411_project

Conflicts:
	cky.js