Initial commit
Changed .gitignore
Merge branch 'master' of https://github.com/yanyan300300/Algorithms2

Conflicts:
	.gitignore