register
Merge branch 'master' of https://github.com/apa915436/ccsp

Conflicts:
	routes/index.js