commit before merge
Merge branch 'master' of github.com:kyleshike/flatiron-students-unit-1
Merge branch 'master' of github.com:kyleshike/flatiron-students-unit-1
path fix for data_controller to generate
merge fix