new ja test branch
Merge branch 'master' of https://github.com/rogue-hack-lab/gitworkshop into jabranch
Merge pull request #2 from rogue-hack-lab/jabranch

Jabranch