first commit
Merge branch 'master' of https://github.com/Taitsu/my_scala
first commit