fixed the views. all controller methods have been included in the controllers where they belong
Merge pull request #42 from fiddler-crabs-2014/Shaun-Final

fixed the views. all controller methods have been included in the contro...