added controller info
Merge branch 'master' of github.com:jaclynj/ship2ship