Added link to Github 'contributing' article. Also fixed a few line ending conflicts.