some changes
Merge branch 'master' of https://github.com/danielAparicio/ScalaReactiveProg

Conflicts:
	suggestions/src/main/scala/suggestions/gui/WikipediaApi.scala
Merge branch 'master' of https://github.com/danielAparicio/ScalaReactiveProg
deleting .orig
Error Handling stuff
r Please enter the commit message for your changes. Lines starting