merge view and template
merge view template
merge game
final
Merge pull request #4 from jim800121/puzzle_view_merge

merge all
Merge pull request #9 from jim800121/master

merge all