moving stuff around
Merge branch 'master' of github.com:znmeb/CompJournoStick