merged conflicts
Merge branch 'master' of github.com:liangvic/ViterbiEweek