Merge branch 'master' of /Users/daviddang/githubrepos/DependencyVisualizer with conflicts.
Capitalized fileFolder