Add more Set Pieces
update .DS_Store
Merge branch 'Nicole'

Conflicts:
	Blocklight_Prototype/.DS_Store

Blocklight_Prototype/Blocklight_Prototype.xcodeproj/project.xcworkspace/
xcuserdata/nang1.xcuserdatad/UserInterfaceState.xcuserstate