this wtf git learning -mastering :D
Merge github.com:franzwcom/angular-test