started working on iPad
Merge branch 'master' of github.com:noloman/NewShutterbug

Conflicts:
	NewShutterbug.xcodeproj/project.pbxproj
	NewShutterbug/iPad.storyboard