swapped in ImageViews for labels in Storyboard
Merge remote-tracking branch 'origin/master'
fixed conflicts