rm conflicted pyc
Merge branch 'master' of github.com:xugao/CS498stkFinalProject