new
Delete asdfg
Merge remote-tracking branch 'origin/WE'
Merge remote-tracking branch 'NP/master' into we