Beginning README
Fix merge issues