lint work
Merge branch 'cli-app-refactor' of github.com:CraZySacX/overbuild into cli-app-refactor