for merge
for merge
Merge branch 'master' of 166.111.59.15:woodyme/2014janxlp
修改极限学习工作流图示
add photos
correct some namings
Changed some text in the XLPWorkflow PPT
add an instruction for resolving conflicts
调整顺序和内容
Merged with changes made in the meeting with Fu Zhi Yong
Added files
和付志勇老师开会后改动
添加物理环境-模型-数字空间图
Added the Applicaiton form for XLP2014Jan.
Merge branch 'master' of 166.111.59.15:woodyme/2014janxlp
Added one page in XLP2014 Workflow PPT
Swapped the AppForm file from Pages format to Word.
Added the ActivityList.xls
Filled in the ActivityList.xls chart
加入付志勇老师的幻灯片‘
git commit -m 加入付志勇老师的幻灯片‘