ignored output directory
Fixed imports
Finish fix-allotments
Merge branch 'origin/master'