began work on installer
updating readme
fixed merge conflict