Update .gitignore to use defaults
Add no conflict method
Add first tests
Update dependencies
Merge branch 'master' of github.com:lukechesser/MagicHeader.js