Resolve conflicts of week1 & week2 homework due to merging answers branch onto master