Merge branch 'master' of C:\Users\Zhao\PycharmProjects\inf1340_2014_asst2_Halie_Zhao with conflicts.
define decide function