Forms adjusted, tests pass
Upgrade ruby to solve seed problem
Added merge_with name
Fixed controller route to take new_or_edit
Fixed comment bug
Added admin and new filter for showing merge buttons