adds Wicky::DiffTool
uses gem 't-uda/haml' temporarily
adds gem 'sinatra-param'
implements conflict detecting