icon and splash screen
Merge branch 'master' of github.com:aluong91/cse190