text påbörjad
Merge remote-tracking branch 'origin/master'

Conflicts:
	asteroids.cpp
	galaxen.depend
	setup.h