Got Overlay to Work
Merge branch 'shana_playground' into ralph_master

Conflicts:
	MappedIn.xcodeproj/project.pbxproj
	MappedIn/Base.lproj/Main.storyboard
	MappedIn/XYZViewController.h
	MappedIn/XYZViewController.m
Got shana's code in, will merge again
Merge branch 'shana_playground' into ralph_master

Conflicts:
	MappedIn/XYZViewController.m
cleaned up
Started swipe
 added files