contollers
updating server
Merge pull request #1 from kz363/controller2

Controller2