Lade till min mormor och morfar i profiles
Merge remote-tracking branch 'origin/master'

Conflicts:
	qt/project_fluxx/profiles.txt
	src/GameLogic.cc