Test: removing a CSS file from master
Removing uglified scripts from master
Removing server/task files from master
Removing no-longer-necessary .htaccess
Updated the README to describe Node hosting
Deleting and readding files to prevent merge conflicts
Readding production files for Heroku
Removed and readding files to prevent merge conflicts
Restoring server/task files to Heroku branch
Adding a test commit for a trial merge
Trial merge
Another throwaway commit
Merge branch 'master' into heroku
Added explicit "var" declarations where necessary
Merge branch 'master' into heroku