modify pushapi conf
update
Merge remote branch 'upstream/master'
up
Merge remote branch 'upstream/master'
add notifyapi
Merge pull request #14 from gooo000/master

modify pushapi conf
up
Merge branch 'master' of github.com:chenyf/push
Merge branch 'master' of https://github.com/chenyf/push

Conflicts:
	comet/server.go