Added 'controls' info section
Merge branch 'master' of https://github.com/rysquash/hackathon