add main.c
Merge branch 'add-main'
Merge remote-tracking branch 'upstream/master'