modified:   static/img/screenshot_ui1.jpg
	modified:   static/img/screenshot_ui2.jpg
Merge branch 'colleague_game_branch' of https://github.com/jiyinhe/fedweb_ui into colleague_game_branch