fixed typo on landing
merged master, resolved conflict