template fixes
fix merg
Merge branch 'colleague_game_branch' of git@github.com:jiyinhe/fedweb_ui into colleague_game_branch
new instructions