Restarting Project
Making tests build
Git-ignore
Merge branch 'master' of github.com:meekan/meekan-objectivec-sdk

Conflicts:
	.gitignore
	MeekanSDK.podspec
	MeekanSDK.xcodeproj/project.pbxproj
	MeekanSDK/MKNApiAdapter.h
	MeekanSDK/MKNApiAdapter.m
	MeekanSDK/MKNParameters.m
	MeekanSDK/MeekanSDK.m
	MeekanSDKTests/MeekanSDKTests.m
	Podfile
	Pods/Pods.xcodeproj/project.pbxproj
	README.md