add hello git
git world
Merge branch 'dev'

Conflicts:
	hello.txt
mod hello in master br
Merge branch 'dev'

Conflicts:
	hello.txt
httponly cookie
Merge branch 'master' of github.com:gitccsand/ds
rm githutccsand/ds hello.txt
Merge branch 'dev' of github.com:gitccsand/ds into dev
rm gitccsand/ds dev hello and morning