Merge pull request #1 from CocoaChina-editors/master

同步CocoaChina-editors
翻译进度备份1

翻译进度备份1
swift functions

本章还没有翻译完 测试提交...
Merge pull request #56 from haolloyin/master

Using Swift with Cocoa and Objective-C 第三章 03Mix and Match
Merge pull request #1 from CocoaChina-editors/master

合并更新代码
Update 04Adopting Cocoa Design Patterns.md
Update 04Adopting Cocoa Design Patterns.md
勘误01

for syntax
Merge pull request #57 from Jasonbroker/master

勘误01
Update 04Adopting Cocoa Design Patterns.md
校正部分翻译、修改表格格式等

校正部分翻译、修改表格格式等
Merge branch 'master' of https://github.com/CocoaChina-editors/Welcome-to-Swift
表格格式fix

表格格式fix
表格格式fix

表格格式fix
Update 04Adopting Cocoa Design Patterns.md
add syntax highlight
Merge pull request #1 from CocoaChina-editors/master

更新20140605
add syntax highlight
勘误01

for syntax
更新目录文件

更新目录文件