Added merge files to gitignore
Merge branch 'master' of github.com:stefanforsberg/WhiteMagic