updates
updates
yuiss
sdsds
Merge branch 'master' of github.com:vbokser/Postcard

Conflicts:
	Postcard.xcodeproj/project.pbxproj
	Postcard.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Postcard.xcodeproj/xcuserdata/vitaly.xcuserdatad/xcschemes/Postcard.xcsc
heme

Postcard.xcodeproj/xcuserdata/vitaly.xcuserdatad/xcschemes/xcschememanag
ement.plist
	Postcard/AppDelegate.swift
	Postcard/Base.lproj/LaunchScreen.xib
	Postcard/Base.lproj/Main.storyboard
	Postcard/Images.xcassets/AppIcon.appiconset/Contents.json
	Postcard/Info.plist
	Postcard/ViewController.swift
	PostcardTests/Info.plist
	PostcardTests/PostcardTests.swift
	README.md