add rule, add api
Merge remote-tracking branch 'upstream/master'
reslove conflict
readd project
remove unecessary files
Merge pull request #2 from owensss/master

add rule, add api