Allen update loacl @ branch master (this should create a conflict. since Allen updated remote before local)
Merge remote-tracking branch 'siuwu0901_Github/master'
Solved conflict with remote master