Merged from internal
Update CONTRIBUTORS.md
Responed to merge comments
Merge branch 'master' of github.com:asacamano/K2
Merge pull request #8 from asacamano/master

Merged my files from internal
Merge remote-tracking branch 'upstream/master'
made changed according to Andrew Sacamano's comments