cleens up
cleens up
adds some logic to set up parent when signing up
nada
nada
nada
goes back to old version
Merge branch 'master' of https://github.com/saraKsara/SKAP
goes back to old version
fixed broken files
Merge branch 'friday'

Conflicts:
	SKAP.xcodeproj/project.xcworkspace/xcuserdata/asapersson.xcuserdatad/UserInterfaceState.xcuserstate
	SKAP/Feed.storyboard