initial commit with working c bindings
fix conflict in README
resolve conflict with master