update
Merge branch 'master' of https://github.com/aipdx-wdim351/wdim351-team-1

Conflicts:
	.DS_Store