Add account
Merge remote-tracking branch 'coursLucas/Develop'

Conflicts:
	client/main.js
Merge remote-tracking branch 'coursLucas/master'
resolve merge pb main.js
Merge pull request #7 from Dadaoxy/master

add account