doing some stuff
Merge remote-tracking branch 'amy/master'

Conflicts:
	.gitignore
	DLScavenger.xcodeproj/project.xcworkspace/xcuserdata/detroitlabsuser.xcuserdatad/UserInterfaceState.xcuserstate
fixing stuff
Merge pull request #9 from northofnormal/fixinstuff

Fixinstuff