First commit
Merge remote-tracking branch 'upstream/master' into cc_dict
add name to contributors file