:+1:

:smoking:
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/tommi.txt
Merge branch 'master' of https://github.com/Ianuarius/Puutarhapeli