1d21cab2e4
Conflicts: app/views/projects/index.rhtml lib/chili_project/compatibility.rb
Conflicts: app/views/projects/index.rhtml lib/chili_project/compatibility.rb