Grammar correction
Merge branch 'master' of https://github.com/scala-vienna/DevFest2013-Workshop