Merge branch 'master' into zel
all model and controller specs done
Merge pull request #43 from zelzel2315/zel

Zel