ignore cache
merged conflicts
add homework 8