123
Merge branch 'master' of https://github.com/tsu710785/CCSP-project

Conflicts:
	javascripts/index.js
remove some unnessary content
remove some unnessary content
remove some unnessary content