Merge pull request #1 from capitaladot/controllersAndModels

Controllers and models
Committing to pull.
Merge remote-tracking branch 'origin/master' into controllersAndModels