uudet koodit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Poke/Poke.pro.user
	Poke/form.cpp
	Poke/form.ui
	Poke/mainwindow.cpp
	Poke/mainwindow.h