j1
signin login ok
Merge branch 'brancheloi'
merge login signin
sessionstorage update
some style
Merge branch 'post'

Conflicts:
	public/js/script.js
	public/js/templates.html
Merge pull request #8 from EloiZ/styleloi

some style
Merge branch 'post'
aa
damien
change play
Merge branch 'master' of https://github.com/EloiZ/Defi

Conflicts:
	public/js/script.js
	public/js/templates.html
getname
Merge branch 'master' into post

Conflicts:
	public/js/script.js
	public/js/templates.html
name display