Added the merge files to the ignore
Merge branch 'master' of github.com:CiaranMcCann/Nina