Accidently named images wrong
Merge branch 'master' into ryan