asdf
Merge branch 'master' of https://github.com/danoqualls/Brand-New-view-2

Conflicts:
	Brand New view.xcodeproj/project.xcworkspace/xcshareddata/Brand New
view.xccheckout