controller begin view
Merge branch 'master' of https://github.com/theklr/FindmeImdrunk
resolve conflicts with merge