code reordering and documentation of controllers
Merge branch 'master' into codeSorting-controller
Merge pull request #43 from ray176/codeSorting-controller

code reordering and documentation of controllers