controller & spec updated
updated model spec
merging in Jons page controller spec changes with uzzer's new spec