Initial commit
merging into podspec format
fixed conflicts