add .gitignore
Merge branch 'master' of https://github.com/zhangboyce/Algorithm

Conflicts:
	.idea/workspace.xml