remove ds file
Merge branch 'master' of https://github.com/johnwatson11218/nanodegree

Conflicts:
	.DS_Store
adding gitignor