added controller stuff
Merge branch 'master' of github.com:juliekraft/bludkin