updated controller with chris
Merge branch 'erb_frame' of github.com:xianny/guide-dog into erb_frame

* 'erb_frame' of github.com:xianny/guide-dog:
  awesome version