Merge branch '5e' of github.com:Jasrags/shadowrun into Jasrags-5e
Merge branch '5e' of github.com:omnicolor/shadowrun into 5e