add progress
add progress
Merge pull request #7 from mmartin8910/controller_tests

Controller tests