ready to merge
Merge branch 'fedora21' of github.com:znmeb/CompJournoStick into fedora21

Conflicts:
	1SetUpWorkstation/packagelist.txt