wrote about inheritance, functions, changed a few words in intro
merged