fixed two typos
updats
fixes merge conflict in six california's quiz
Merge branch 'evie-development'