controllers done
Merge pull request #4 from JustSilverman/controllers

controllers done for the most part