overlay
set up imagepickercontrollerdelegate methods
Merge branch 'master' of github.com:georgewu2/FaceLapse

Conflicts:
	FaceLapse.xcodeproj/project.pbxproj
	FaceLapse/OverlayView.h
	FaceLapse/OverlayView.m
	FaceLapse/OverlayViewController.h