add AOP.js
notepad
m
Merge branch 'master' of https://git.oschina.net/xyz327/mygit into 'a'
一个简单的promise库
new version
myeditor
Merge branch 'master' of https://git.oschina.net/xyz327/mygit

Conflicts:
	xyz/promise.js
Merge branch 'master' of https://git.oschina.net/xyz327/mygit
editor
'edit'
js template