Added license
Merge remote-tracking branch 'origin/master' into c++
Added files I had forgotten to