cleared merge conflict in application.js
Merge pull request #2 from rickbrunstedt/homepage-experiment

merging homepage-experiment