removed old license header
add license
Merge remote-tracking branch 'origin/master'