pull error
Merge branch 'master' of https://github.com/nanusdad/appl_admin
Merge branch 'master' of https://github.com/nanusdad/appl_admin

Conflicts:
	client/index.html
Merge branch 'master' of https://github.com/nanusdad/appl_admin

Conflicts:
	client/client.html