main.c added
printf added
Merge branch 'test1'