Changed controller
Readme
Merged conflicts
Merge pull request #1 from tobyk100-test/master

Changed Controller and Readme