Merge branch 'master' of github.com:lbzhao28/IRecorder
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.conf