Added controller skeleton
Fixed merge conflict: kept both code on controller
Merge pull request #1 from masidonion/sam_jake/controller

Sam jake/controller