mearge
Merge branch 'master' of https://github.com/Gearace/koa-mysql-sample

Conflicts:
	routes/userRoute.js