jhfhjfhk
Birch latest
Merge branch 'master' into ollie

Conflicts:
	GonePhishing.xcodeproj/project.pbxproj
	GonePhishing/Models/GPMedia.h
	GonePhishing/Models/GPMedia.m
	GonePhishing/Models/GPMessage.h
	GonePhishing/Models/GPMessage.m
	GonePhishing/Models/GPPhoto.h
	GonePhishing/Models/GPPhoto.m
	GonePhishing/Models/GPVideo.h
	GonePhishing/Models/GPVideo.m
	GonePhishing/ViewController.m
	Podfile
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods-Bolts-Private.xcconfig
	Pods/Pods-Facebook-iOS-SDK-Private.xcconfig
	Pods/Pods-Parse-Private.xcconfig
	Pods/Pods-acknowledgements.markdown
	Pods/Pods-acknowledgements.plist
	Pods/Pods-environment.h
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj
House keeping
Merge pull request #24 from Gatzy118/ollie

Ollie