new features
had to manually merge, because tabs/spaces weren't right, and we edited the same section. i'll use spaces instead of tabs from now on