Merge pull request #41 from zelzel2315/zel

Zel
Merge branch 'master' into zel
all model and controller specs done