Merge branch 'master' of https://github.com/lancetipton04/WeWright into models
controller pivot
resolve superficial merge conflict
Deleting typos and empty files
Merge pull request #3 from lancetipton04/models

Resolving some conflicts between branches, all superficial