added progress report;
Merge branch 'master' of github.com:djia/cs221project