functional start
adds md docs for rtd
initial github conflict resolution