rename alien.png => alien-placeholder.png
Merge branch 'master' of github.com:lju/Homework1