Modify calculate_progress method
Upgrade users controller spec
Upgrade works controller spec
Upgrade users/show view
Merge pull request #12 from ahkr/develop

Develop