updated project
added coffeescript
removed conflicts