added raft files, starting to integrate
hmm
Merge remote-tracking branch 'origin/master'