Now there is bear!
Merge branch 'master' of https://github.com/hacklab-turku/luumuhillo

Conflicts:
	source/datastorage.cpp