f6ca0db Updated comment, fixed merge conflicts

Merged and Committed by tachoknight 5 years ago
    Updated comment, fixed merge conflicts
    
        
file modified
+2 -0