Merge branch 'master' of https://github.com/ja-cha/scala-samples.git

Conflicts:
	Scala-Snippets/src/com/scala/examples/pattern/PatternMatching.scala
Merge branch 'master' of https://github.com/ja-cha/scala-samples.git