Animal Shelter Work
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	Sarah/w1d2/.DS_Store
Work in Final Stock Homework, I am still getting errors
This is the final version
Merge pull request #61 from NirajVyas/master

Final Stock Homework