Merge branch 'master' of https://github.com/ShaeS/Final_Project

Conflicts:
	.DS_Store
ds