Merge remote-tracking branch 'origin/master'

merged branch master (storyboard + color changer on home screen)