Removed extraneous comments and methods from file_sender and file_receiver
Added semicolons to end of lines
Resolved merge conflict
Merge pull request #14 from Surram/code_cleanup

Removed extraneous comments and methods from file_sender and file_receiv...