Fixed typo
Fixed view
Merge branch 'master' of github.com:couchtape/couchtapeapp
Socket stuff
Merge branch 'master' of github.com:couchtape/couchtapeapp
only controller stuff