Fixes Issue #29

Refactored the fitness controller and added a user controller