try
conflict
updated
remove conflicts
upload angular.js
include angular js
new layout&style
Merge pull request #3 from JunjieWang/jj_0426

Jj 0426
Merge branch 'master' into donghe
fixed the coding format