asdasd
Merge branch 'messagesModel' of https://github.com/pawel-stepniewski/sag-whutupaoro into messagesModel

Conflicts:
	src/main/scala/pw/sag/Config.scala
	src/main/scala/pw/sag/Player.scala
	src/main/scala/pw/sag/Team.scala
	src/main/scala/pw/sag/Whutupaoro.scala
Merge branch 'messagesModel' of https://github.com/pawel-stepniewski/sag-whutupaoro into messagesModel

Conflicts:
	src/main/scala/pw/sag/Config.scala
	src/main/scala/pw/sag/Team.scala
	src/main/scala/pw/sag/Whutupaoro.scala