GEN
Merge branch 'master' of https://github.com/AchillesWang/Swift

Conflicts:
	Protocol/Protocol/main.swift