Updated schedule & home
Fixed odd merge conflict with amending my last commit