Merge pull request #1 from elantzb/branch1

changed file1
removed comments from file1
commented line1