reverting to older controllers.js
Revert "reverting to older controllers.js"

This reverts commit cfd90b6b01f758064d077dca609ee5df48804203.
omg it's 9 am i'm going to pass out
Merge branch 'master' of github.com:jokeofweek/drunken-meme