finished adding controllers
Merge pull request #1 from st028/controller-setup

finished adding controllers