Fixes for conflicting methods with no scope resolution operators
Merge remote-tracking branch 'CrackingTheCodingInterview/master'