Laatste week
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/img/Thumbs.db
	assets/img/fly_rail.png
	assets/img/mergeButton.png
	assets/img/portrait_mode.png
	assets/img/preloadbar - kopie.png
	assets/img/preloadbar.png
	assets/img/radar_cursor.png
	assets/img/spr_boss_die_strip13.png
	assets/img/spr_button.png
	assets/img/spr_double_final_strip4.png
	assets/img/spr_myplane_strip2.png
	assets/img/spr_ns_strip11.png
	assets/img/spr_plane_strip2.png
	assets/img/spr_wk_strip11.png
	index.html