update ignores to exclude .DS_Store
Merge branch 'master' of https://github.com/HParker/puzzle-solver

Conflicts:
	.gitignore