Ahoefinger/topic/add chris and kims photos

merge of #253