removed commented out code and fleshed out the readme
fixed merge conflicts