added controller, updated ouline
Merge pull request #12 from fox-squirrels-2013/contoller

added controller, updated ouline