modified .gitignore

get rid of annoying MAC .DS_Store file
Merge branch 'master' of https://github.com/henrik-rose-hulman/CSSE463

Conflicts:
	Code/.DS_Store
deleted .DS_Store