dded whackanicon
added iconidoos
Merge branch 'master' of https://github.com/lisagumerman/thesis