Code Submission RC1
Merge branch 'master' of https://github.com/camo1018/CFGTeam9