more work done
Merge branch 'feedback-per-larry' of github.com:mredwardchen/CSR2014 into feedback-per-larry