One more test commit
Merge branch 'master' into heroku
Unnecessary semicolon
Merge branch 'master' into heroku
Updating after merge for Heroku
Reverting to a variable-style function declaration
Merge branch 'master' into heroku
Oops
Merge branch 'master' into heroku
Oops
Merge branch 'master' into heroku
Remove the "var" from setHeight()'s declaration, because we need it to be global
Merge branch 'master' into heroku