Merge pull request #1 from smileyface525/models_setup

Models setup
'merge with master'
Merge branch 'master' into controllers_setup