added view back for tests to pass
Merge branch 'master' of https://github.com/nickpassarella/lunchpad.us
merging