asdf
Merge branch 'master' of https://github.com/munnellg/ir_system

Conflicts:
	loading.ui
	src/irapploading.c
	src/irapploading.h
	src/resource.c