Added comments on sample code
lab1.c conflict resolved
Merge branch 'temp'