..
up test stvenantlin, stvenantlin.c and CMakeList
correct CMakeLists
stvnantfp model
CMakeLists.txt delete other application
First Result
for merge
up
Merge branch 'master' into waves
fix conflict
Merge 2
change for merge
Merge branch 'master' into waves
Merge branch 'master' into waves
Merge branch 'master' into waves
Merge branch 'waves'

Conflicts:
	CMakeLists.txt
fix problem
update test
fix problem
add test executable to ignore