Merge branch 'master', remote-tracking branch 'origin'
Added a C file. Compile by typing gcc -o test test.c