mixed up controller docs
Merge pull request #19 from G5/mixed_up_doc

mixed up controller docs