wat
Merge branch 'satellite' of https://github.com/MGM-KTH/travelguide into satellite

Conflicts:
	main.c
Merge branch 'satellite' of https://github.com/MGM-KTH/travelguide into satellite