WinMerge¶

All programming computers should have WinMerge, as GitHub automerging doesnt always work when there are commit confilicts. WinMerge is a prett awesome tool for merging deifferent copies of the same codebase.