stub controllers
stub controllers
Merge branch 'master' into skeleton
resolve whitespace merge conflict
Merge pull request #7 from nastysloper/skeleton

stub controllers