The Last Commit

finish all the test cases
Merge branch 'controller_branch'