add test.cpp
Merge branch 'new_stuff'