Initial commit.
Fix conflict in application.js