replaced with correct files
Merge pull request #1 from JustSilverman/controller

replaced with correct files