building up readme
fixed our conflict and started adding instructions