created coffeescript version, stashed compiled version in 'compiled' file
fixing merge conflict
added back old version