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

Conflicts:
	cky.js
	index.php
Merge branch 'master' of https://github.com/CS411/cs411_project
a lot