Added proper comments and changed names of files
Merged branches