removed @author tag in comments
basic controllers implemented
Merge branch 'master' of https://github.com/altschuler/spaced
Merge branch 'controlling'