Nice touch ups to polaroid view controller
Merge branch 'master' of https://github.com/adamdahan/StyleSnaps2 into new_branch_test

Conflicts:
	Polaroid.storyboard
	PolaroidViewController.m
	StyleSnaps.xcodeproj/project.pbxproj
added a separator