cofeescript werk
fixed merge conflicts