remove node_modules/New Text Document.txt
Merge branch 'master' of https://github.com/sofuxro/Front-End-Template
Merge branch 'master' of https://github.com/sofuxro/Front-End-Template
ignore removed
Merge branch 'master' of https://github.com/sofuxro/Front-End-Template

Conflicts:
	.gitignore