Merge pull request #87 from kulsoom2003/branchedForIssue85

Fixes Issue #85 (and another proofreading correction)

book/src/pages/expressions/05-exercises.md

@@ -38,8 +38,8 @@ A bit of exploration should convince you that yes, Scala does maintain the stand
 
 Below we've written a number of expressions. For each expression, try to answer the questions:
 
-1. It will compile?
-2. If it compiles, what is it's type?
+1. Will it compile?
+2. If it compiles, what is its type?
 3. If it compiles can it be evaluated, or will it fail at run-time?
 
 Then try to check your guesses using the worksheet. If you guessed wrong, try to think about what part of your understanding is incorrect. 

book/src/pages/foreword-1.md

@@ -65,14 +65,15 @@ For further advancement we recommend considering one of the many excellent
 Scala textbooks out there, including our own [Essential Scala][essential-scala].
 
 If you are working through the exercises on your own,
-we highly recommend joining our [Gitter chat room][underscore-gitter]
+we highly recommend joining our [Discord server][creative-scala-discord]
 to get help with the exercises and provide feedback on the book.
 
+
 The text of [Creative Scala][github-creative-scala] is open source,
 as is the source code for the [Doodle][github-doodle]
 drawing library used in the exercises.
 You can grab the code from our [GitHub account][underscore-github].
-Contact us on Gitter or by email if you would like to contribute.
+Contact us on Discord or by email if you would like to contribute.
 
 Thanks for downloading and happy creative programming!
 
@@ -85,8 +86,7 @@ This is an *early access* release of Creative Scala.
 There may be typos and other errors in the text and examples.
 
 If you spot any mistakes or would like to provide feedback,
-please let us know via our [Gitter chat room][underscore-gitter]
-or by email:
+please let us know via our [Discord server][creative-scala-discord] or by email:
 
  - Dave Gurnell ([[email protected]](mailto:[email protected]))
  - Noel Welsh ([[email protected]](mailto:[email protected]))

book/src/pages/links.md

@@ -2,7 +2,7 @@
 [github-creative-scala]: https://github.com/underscoreio/creative-scala
 [essential-scala]: http://underscore.io/training/courses/essential-scala
 [underscore-github]: https://github.com/underscoreio
-[underscore-gitter]: https://gitter.im/underscoreio/scala
+[creative-scala-discord]: https://discord.com/invite/rRhcFbJxVG
 [underscore]: http://underscore.io
 [twitter-dave]: http://twitter.com/davegurnell
 [twitter-jono]: http://twitter.com/jonoabroad

book/src/pages/summary/index.md

@@ -234,7 +234,7 @@ discussing and demonstrating core design patterns and the benefits they offer.
 
 If you want to challenge yourself,
 try drawing something more complex with Doodle and
-sharing it with us via [Gitter][underscore-gitter].
+sharing it with us via [Discord][creative-scala-discord].
 There are lots of things you can try---check the `examples` directory
 in the Doodle codebase for some suggestions: