copied from CompJournoStick
Merge branch 'master' of github.com:znmeb/CompJournWin8Pro

Conflicts:
	load-packages.R